summaryrefslogtreecommitdiff
path: root/helpcontent2/source/text/swriter/01
diff options
context:
space:
mode:
Diffstat (limited to 'helpcontent2/source/text/swriter/01')
-rw-r--r--helpcontent2/source/text/swriter/01/01150000.xhp40
-rw-r--r--helpcontent2/source/text/swriter/01/01160300.xhp4
-rw-r--r--helpcontent2/source/text/swriter/01/02110100.xhp8
-rw-r--r--helpcontent2/source/text/swriter/01/02120000.xhp26
-rwxr-xr-xhelpcontent2/source/text/swriter/01/02120100.xhp6
-rw-r--r--helpcontent2/source/text/swriter/01/02140000.xhp2
-rw-r--r--helpcontent2/source/text/swriter/01/02150000.xhp6
-rw-r--r--helpcontent2/source/text/swriter/01/02160000.xhp2
-rw-r--r--helpcontent2/source/text/swriter/01/02170000.xhp2
-rw-r--r--helpcontent2/source/text/swriter/01/04010000.xhp12
-rw-r--r--helpcontent2/source/text/swriter/01/04020000.xhp2
-rw-r--r--helpcontent2/source/text/swriter/01/04020100.xhp42
-rwxr-xr-xhelpcontent2/source/text/swriter/01/04020200.xhp4
-rw-r--r--helpcontent2/source/text/swriter/01/04030000.xhp12
-rw-r--r--helpcontent2/source/text/swriter/01/04040000.xhp4
-rw-r--r--helpcontent2/source/text/swriter/01/04060000.xhp12
-rwxr-xr-xhelpcontent2/source/text/swriter/01/04060100.xhp12
-rwxr-xr-xhelpcontent2/source/text/swriter/01/04070100.xhp10
-rwxr-xr-xhelpcontent2/source/text/swriter/01/04070200.xhp18
-rwxr-xr-xhelpcontent2/source/text/swriter/01/04070300.xhp10
-rw-r--r--helpcontent2/source/text/swriter/01/04090001.xhp14
-rw-r--r--helpcontent2/source/text/swriter/01/04090002.xhp10
-rw-r--r--helpcontent2/source/text/swriter/01/04090003.xhp34
-rw-r--r--helpcontent2/source/text/swriter/01/04090004.xhp18
-rw-r--r--helpcontent2/source/text/swriter/01/04090005.xhp18
-rw-r--r--helpcontent2/source/text/swriter/01/04090006.xhp16
-rwxr-xr-xhelpcontent2/source/text/swriter/01/04090100.xhp4
-rw-r--r--helpcontent2/source/text/swriter/01/04120100.xhp2
-rwxr-xr-xhelpcontent2/source/text/swriter/01/04120201.xhp10
-rwxr-xr-xhelpcontent2/source/text/swriter/01/04120211.xhp18
-rwxr-xr-xhelpcontent2/source/text/swriter/01/04120212.xhp20
-rwxr-xr-xhelpcontent2/source/text/swriter/01/04120213.xhp14
-rwxr-xr-xhelpcontent2/source/text/swriter/01/04120215.xhp10
-rwxr-xr-xhelpcontent2/source/text/swriter/01/04120217.xhp4
-rwxr-xr-xhelpcontent2/source/text/swriter/01/04120219.xhp4
-rwxr-xr-xhelpcontent2/source/text/swriter/01/04120221.xhp32
-rwxr-xr-xhelpcontent2/source/text/swriter/01/04120222.xhp12
-rwxr-xr-xhelpcontent2/source/text/swriter/01/04120227.xhp34
-rw-r--r--helpcontent2/source/text/swriter/01/04150000.xhp18
-rw-r--r--helpcontent2/source/text/swriter/01/04180400.xhp4
-rw-r--r--helpcontent2/source/text/swriter/01/04200000.xhp18
-rwxr-xr-xhelpcontent2/source/text/swriter/01/05030200.xhp32
-rwxr-xr-xhelpcontent2/source/text/swriter/01/05030400.xhp14
-rwxr-xr-xhelpcontent2/source/text/swriter/01/05030800.xhp45
-rw-r--r--helpcontent2/source/text/swriter/01/05040500.xhp28
-rw-r--r--helpcontent2/source/text/swriter/01/05040600.xhp27
-rw-r--r--helpcontent2/source/text/swriter/01/05040700.xhp28
-rwxr-xr-xhelpcontent2/source/text/swriter/01/05040800.xhp22
-rw-r--r--helpcontent2/source/text/swriter/01/05060100.xhp70
-rw-r--r--helpcontent2/source/text/swriter/01/05060200.xhp28
-rw-r--r--helpcontent2/source/text/swriter/01/05060201.xhp4
-rw-r--r--helpcontent2/source/text/swriter/01/05060300.xhp14
-rw-r--r--helpcontent2/source/text/swriter/01/05060700.xhp10
-rwxr-xr-xhelpcontent2/source/text/swriter/01/05060800.xhp12
-rw-r--r--helpcontent2/source/text/swriter/01/05060900.xhp24
-rw-r--r--helpcontent2/source/text/swriter/01/05090100.xhp26
-rwxr-xr-xhelpcontent2/source/text/swriter/01/05090200.xhp22
-rw-r--r--helpcontent2/source/text/swriter/01/05090300.xhp24
-rw-r--r--helpcontent2/source/text/swriter/01/05110100.xhp4
-rw-r--r--helpcontent2/source/text/swriter/01/05120100.xhp4
-rw-r--r--helpcontent2/source/text/swriter/01/05120400.xhp8
-rw-r--r--helpcontent2/source/text/swriter/01/05130000.xhp2
-rw-r--r--helpcontent2/source/text/swriter/01/05130100.xhp8
-rwxr-xr-xhelpcontent2/source/text/swriter/01/05150000.xhp53
-rw-r--r--helpcontent2/source/text/swriter/01/05150101.xhp175
-rwxr-xr-xhelpcontent2/source/text/swriter/01/05150104.xhp4
-rw-r--r--helpcontent2/source/text/swriter/01/05150200.xhp110
-rw-r--r--helpcontent2/source/text/swriter/01/05170000.xhp16
-rw-r--r--helpcontent2/source/text/swriter/01/05190000.xhp10
-rw-r--r--helpcontent2/source/text/swriter/01/05200000.xhp2
-rw-r--r--helpcontent2/source/text/swriter/01/06030000.xhp10
-rwxr-xr-xhelpcontent2/source/text/swriter/01/06040000.xhp53
-rw-r--r--helpcontent2/source/text/swriter/01/06060000.xhp4
-rwxr-xr-xhelpcontent2/source/text/swriter/01/06060100.xhp16
-rw-r--r--helpcontent2/source/text/swriter/01/06080100.xhp26
-rwxr-xr-xhelpcontent2/source/text/swriter/01/06080200.xhp16
-rw-r--r--helpcontent2/source/text/swriter/01/06090000.xhp38
-rw-r--r--helpcontent2/source/text/swriter/01/06100000.xhp46
-rw-r--r--helpcontent2/source/text/swriter/01/06180000.xhp22
-rwxr-xr-xhelpcontent2/source/text/swriter/01/mailmerge00.xhp2
-rwxr-xr-xhelpcontent2/source/text/swriter/01/mailmerge01.xhp16
-rwxr-xr-xhelpcontent2/source/text/swriter/01/mailmerge02.xhp4
-rwxr-xr-xhelpcontent2/source/text/swriter/01/mailmerge03.xhp14
-rwxr-xr-xhelpcontent2/source/text/swriter/01/mailmerge04.xhp24
-rwxr-xr-xhelpcontent2/source/text/swriter/01/mailmerge05.xhp12
-rwxr-xr-xhelpcontent2/source/text/swriter/01/mailmerge06.xhp14
-rwxr-xr-xhelpcontent2/source/text/swriter/01/mailmerge07.xhp12
-rwxr-xr-xhelpcontent2/source/text/swriter/01/mailmerge08.xhp46
-rwxr-xr-xhelpcontent2/source/text/swriter/01/mm_copyto.xhp4
-rwxr-xr-xhelpcontent2/source/text/swriter/01/mm_cusgrelin.xhp16
-rwxr-xr-xhelpcontent2/source/text/swriter/01/mm_emabod.xhp20
-rwxr-xr-xhelpcontent2/source/text/swriter/01/mm_seladdblo.xhp14
-rwxr-xr-xhelpcontent2/source/text/swriter/01/mm_seladdlis.xhp10
-rwxr-xr-xhelpcontent2/source/text/swriter/01/mm_seltab.xhp2
-rw-r--r--helpcontent2/source/text/swriter/01/selection_mode.xhp6
95 files changed, 919 insertions, 902 deletions
diff --git a/helpcontent2/source/text/swriter/01/01150000.xhp b/helpcontent2/source/text/swriter/01/01150000.xhp
index 0aff3dcb53..7e3391f9a4 100644
--- a/helpcontent2/source/text/swriter/01/01150000.xhp
+++ b/helpcontent2/source/text/swriter/01/01150000.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -47,42 +47,42 @@
</section>
<paragraph role="paragraph" id="par_id3154102" xml-lang="en-US" l10n="U" oldref="4">During printing, the database information replaces the corresponding database fields (placeholders). For more information about inserting database fields refer to the <link href="text/swriter/01/04090006.xhp" name="Database"><emph>Database</emph></link> tab page under <emph>Insert - Fields - Other</emph>.</paragraph><comment>db browser explorer</comment>
<bookmark xml-lang="en-US" branch="hid/HID_TLB_TREELISTBOX" id="bm_id5399029" localize="false"/><paragraph role="paragraph" id="par_id8186895" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select a database and table.</ahelp></paragraph><comment>db browser records</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_CTL_TABBROWSER" id="bm_id6056703" localize="false"/><paragraph role="paragraph" id="par_id7812433" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select database records. Drag-and-drop rows or cells to the document to insert contents. Drag-and-drop column headers to insert fields.</ahelp></paragraph><comment>save as single document</comment>
-<bookmark xml-lang="en-US" branch="hid/1446609447" id="bm_id7246620" localize="false"/><paragraph role="paragraph" id="par_id3101901" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click to create one big document containing all data records.</ahelp></paragraph><comment>save as individual documents</comment>
-<bookmark xml-lang="en-US" branch="hid/1446609448" id="bm_id6964323" localize="false"/><paragraph role="paragraph" id="par_id5345011" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click to create one document for every one data record.</ahelp></paragraph><comment>generate file name from database</comment>
-<bookmark xml-lang="en-US" branch="hid/1446609961" id="bm_id6631672" localize="false"/><paragraph role="paragraph" id="par_id5631580" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Generate each file name from data contained in a database.</ahelp><comment>UFI: sorry, spec doc has no more info about the specifics</comment></paragraph><comment>file format</comment>
-<bookmark xml-lang="en-US" branch="hid/1446612524" id="bm_id8452711" localize="false"/><paragraph role="paragraph" id="par_id8992889" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select the file format.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_DLG_MAILMERGE_RB_SAVE_SINGLE_DOC" id="bm_id7246620" localize="false"/><paragraph role="paragraph" id="par_id3101901" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click to create one big document containing all data records.</ahelp></paragraph><comment>save as individual documents</comment>
+<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_DLG_MAILMERGE_RB_SAVE_INDIVIDUAL" id="bm_id6964323" localize="false"/><paragraph role="paragraph" id="par_id5345011" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click to create one document for every one data record.</ahelp></paragraph><comment>generate file name from database</comment>
+<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_DLG_MAILMERGE_RB_GENERATE_FROM_DATABASE" id="bm_id6631672" localize="false"/><paragraph role="paragraph" id="par_id5631580" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Generate each file name from data contained in a database.</ahelp><comment>UFI: sorry, spec doc has no more info about the specifics</comment></paragraph><comment>file format</comment>
+<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_DLG_MAILMERGE_LB_FILTER" id="bm_id8452711" localize="false"/><paragraph role="paragraph" id="par_id8992889" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select the file format.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154482" xml-lang="en-US" level="2" l10n="U" oldref="5">Records</paragraph>
<paragraph role="paragraph" id="par_id3154565" xml-lang="en-US" l10n="U" oldref="6">Determines the number of records for printing the form letter. One letter will be printed for each record.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_MAILMERGE:RB_ALL" id="bm_id3149685" localize="false"/><paragraph role="heading" id="hd_id3155896" xml-lang="en-US" level="3" l10n="U" oldref="7">All</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MAILMERGE:RB_ALL" id="bm_id3149685" localize="false"/><paragraph role="heading" id="hd_id3155896" xml-lang="en-US" level="3" l10n="U" oldref="7">All</paragraph>
<paragraph role="paragraph" id="par_id3149691" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:RADIOBUTTON:DLG_MAILMERGE:RB_ALL">Processes all the records from the database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_MAILMERGE:RB_MARKED" id="bm_id3143279" localize="false"/><paragraph role="heading" id="hd_id3155186" xml-lang="en-US" level="3" l10n="U" oldref="9">Selected records</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MAILMERGE:RB_MARKED" id="bm_id3143279" localize="false"/><paragraph role="heading" id="hd_id3155186" xml-lang="en-US" level="3" l10n="U" oldref="9">Selected records</paragraph>
<paragraph role="paragraph" id="par_id3149483" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:RADIOBUTTON:DLG_MAILMERGE:RB_MARKED">Processes only the marked records from the database. This option is only available when you have previously marked the necessary records in the database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_MAILMERGE:RB_FROM" id="bm_id3149097" localize="false"/><paragraph role="heading" id="hd_id3149819" xml-lang="en-US" level="3" l10n="U" oldref="23">From</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MAILMERGE:RB_FROM" id="bm_id3149097" localize="false"/><paragraph role="heading" id="hd_id3149819" xml-lang="en-US" level="3" l10n="U" oldref="23">From</paragraph>
<paragraph role="paragraph" id="par_id3149104" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SW:RADIOBUTTON:DLG_MAILMERGE:RB_FROM">Specifies which records to include in your form letter.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:DLG_MAILMERGE:NF_FROM" id="bm_id3148978" localize="false"/><paragraph role="heading" id="hd_id3151260" xml-lang="en-US" level="3" l10n="U" oldref="11">From:</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_MAILMERGE:NF_FROM" id="bm_id3148978" localize="false"/><paragraph role="heading" id="hd_id3151260" xml-lang="en-US" level="3" l10n="U" oldref="11">From:</paragraph>
<paragraph role="paragraph" id="par_id3149034" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:NUMERICFIELD:DLG_MAILMERGE:NF_FROM">Specifies the number of the first record to be printed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:DLG_MAILMERGE:NF_TO" id="bm_id3153643" localize="false"/><paragraph role="heading" id="hd_id3153631" xml-lang="en-US" level="3" l10n="U" oldref="25">To:</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_MAILMERGE:NF_TO" id="bm_id3153643" localize="false"/><paragraph role="heading" id="hd_id3153631" xml-lang="en-US" level="3" l10n="U" oldref="25">To:</paragraph>
<paragraph role="paragraph" id="par_id3145758" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SW:NUMERICFIELD:DLG_MAILMERGE:NF_TO">Specifies the number of the last record to be printed.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3152772" xml-lang="en-US" level="2" l10n="U" oldref="13">Output</paragraph>
<paragraph role="paragraph" id="par_id3155138" xml-lang="en-US" l10n="U" oldref="14">Determines whether to send your form letters to a printer or save them to a file.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_MAILMERGE:RB_PRINTER" id="bm_id3150497" localize="false"/><paragraph role="heading" id="hd_id3150485" xml-lang="en-US" level="3" l10n="U" oldref="15">Printer</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MAILMERGE:RB_PRINTER" id="bm_id3150497" localize="false"/><paragraph role="heading" id="hd_id3150485" xml-lang="en-US" level="3" l10n="U" oldref="15">Printer</paragraph>
<paragraph role="paragraph" id="par_id3149167" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW:RADIOBUTTON:DLG_MAILMERGE:RB_PRINTER">Prints the form letters.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_MAILMERGE:RB_FILE" id="bm_id3145785" localize="false"/><paragraph role="heading" id="hd_id3145773" xml-lang="en-US" level="3" l10n="U" oldref="39">File</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MAILMERGE:RB_FILE" id="bm_id3145785" localize="false"/><paragraph role="heading" id="hd_id3145773" xml-lang="en-US" level="3" l10n="U" oldref="39">File</paragraph>
<paragraph role="paragraph" id="par_id3155910" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid="SW:RADIOBUTTON:DLG_MAILMERGE:RB_FILE">Saves the form letters in files.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_MAILMERGE:CB_SINGLE_JOBS" id="bm_id3151383" localize="false"/><paragraph role="heading" id="hd_id3151371" xml-lang="en-US" level="3" l10n="U" oldref="35">Single print jobs</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_MAILMERGE:CB_SINGLE_JOBS" id="bm_id3151383" localize="false"/><paragraph role="heading" id="hd_id3151371" xml-lang="en-US" level="3" l10n="U" oldref="35">Single print jobs</paragraph>
<paragraph role="paragraph" id="par_id3155858" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SW:CHECKBOX:DLG_MAILMERGE:CB_SINGLE_JOBS">Prints each form letter individually with the selected printer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_MAILMERGE:ED_PATH" id="bm_id3150122" localize="false"/><paragraph role="heading" id="hd_id3150111" xml-lang="en-US" level="3" l10n="U" oldref="41">Path</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_MAILMERGE:ED_PATH" id="bm_id3150122" localize="false"/><paragraph role="heading" id="hd_id3150111" xml-lang="en-US" level="3" l10n="U" oldref="41">Path</paragraph>
<paragraph role="paragraph" id="par_id3150687" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SW:EDIT:DLG_MAILMERGE:ED_PATH">Specifies the path to store the form letters.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_MAILMERGE:PB_PATH" id="bm_id3147423" localize="false"/><paragraph role="heading" id="hd_id3147412" xml-lang="en-US" level="3" l10n="U" oldref="43">...</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MAILMERGE:PB_PATH" id="bm_id3147423" localize="false"/><paragraph role="heading" id="hd_id3147412" xml-lang="en-US" level="3" l10n="U" oldref="43">...</paragraph>
<paragraph role="paragraph" id="par_id3149553" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid="SW:PUSHBUTTON:DLG_MAILMERGE:PB_PATH">Opens the<emph> Select Path </emph>dialog.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3145263" xml-lang="en-US" level="3" l10n="U" oldref="49">Generate file name from</paragraph>
<paragraph role="paragraph" id="par_id3150547" xml-lang="en-US" l10n="U" oldref="50">Specifies how the file name is generated.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_MAILMERGE:RB_COLUMN" id="bm_id3147743" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:DLG_MAILMERGE:LB_COLUMN" id="bm_id3147747" localize="false"/><paragraph role="heading" id="hd_id3150561" xml-lang="en-US" level="4" l10n="U" oldref="45">Database field</paragraph>
+<!-- removed HID SW:RADIOBUTTON:DLG_MAILMERGE:RB_COLUMN -->
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_MAILMERGE:LB_COLUMN" id="bm_id3147747" localize="false"/><paragraph role="heading" id="hd_id3150561" xml-lang="en-US" level="4" l10n="U" oldref="45">Database field</paragraph>
<paragraph role="paragraph" id="par_id3149829" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="SW:LISTBOX:DLG_MAILMERGE:LB_COLUMN">Uses the content of the selected data field as the file name for the form letter.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_MAILMERGE:RB_FILENAME" id="bm_id3148854" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_MAILMERGE:ED_FILENAME" id="bm_id3148858" localize="false"/><paragraph role="heading" id="hd_id3149848" xml-lang="en-US" level="4" l10n="U" oldref="47">Manual setting</paragraph>
+<!-- removed HID SW:RADIOBUTTON:DLG_MAILMERGE:RB_FILENAME -->
+<!-- removed HID SW:EDIT:DLG_MAILMERGE:ED_FILENAME --><paragraph role="heading" id="hd_id3149848" xml-lang="en-US" level="4" l10n="U" oldref="47">Manual setting</paragraph>
<paragraph role="paragraph" id="par_id3153289" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="SW:EDIT:DLG_MAILMERGE:ED_FILENAME">Creates the file name based on the text you enter, followed by a serial number.</ahelp></paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/swriter/guide/form_letters_main.xhp#form_letters"/>
diff --git a/helpcontent2/source/text/swriter/01/01160300.xhp b/helpcontent2/source/text/swriter/01/01160300.xhp
index bbff354f42..e1c5941bd7 100644
--- a/helpcontent2/source/text/swriter/01/01160300.xhp
+++ b/helpcontent2/source/text/swriter/01/01160300.xhp
@@ -49,10 +49,10 @@
<section id="howtoget">
<embed href="text/swriter/00/00000401.xhp#sendenautoabstract"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:DLG_INSERT_ABSTRACT:NF_LEVEL" id="bm_id3154106" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_INSERT_ABSTRACT:NF_LEVEL" id="bm_id3154106" localize="false"/>
<paragraph role="heading" id="hd_id3147516" xml-lang="en-US" level="2" l10n="U" oldref="3">Included Outline Levels</paragraph>
<paragraph role="paragraph" id="par_id3149804" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SW:NUMERICFIELD:DLG_INSERT_ABSTRACT:NF_LEVEL">Enter the extent of the outline levels to be copied to the new document.</ahelp> For example, if you choose 4 levels, all paragraphs formatted with Heading 1 to Heading 4 are included, along with the number of subsequent paragraphs specified in <emph>Subpoints per Level</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:DLG_INSERT_ABSTRACT:NF_PARA" id="bm_id3154570" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_INSERT_ABSTRACT:NF_PARA" id="bm_id3154570" localize="false"/>
<paragraph role="heading" id="hd_id3151316" xml-lang="en-US" level="2" l10n="U" oldref="5">Subpoints per Level</paragraph>
<paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:NUMERICFIELD:DLG_INSERT_ABSTRACT:NF_PARA">Specify the maximum number of consecutive paragraphs to be included in the AutoAbstract document after each heading.</ahelp> All of the paragraphs up to the maximum defined are included until the next paragraph with a Heading Style is reached.</paragraph>
</body>
diff --git a/helpcontent2/source/text/swriter/01/02110100.xhp b/helpcontent2/source/text/swriter/01/02110100.xhp
index c027ea6fa8..416b83b53d 100644
--- a/helpcontent2/source/text/swriter/01/02110100.xhp
+++ b/helpcontent2/source/text/swriter/01/02110100.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textswriter0102110100xml" indexer="include" status="PUBLISH">
@@ -56,7 +56,7 @@
<paragraph role="paragraph" id="par_id3150045" xml-lang="en-US" l10n="CHG" oldref="6">Open the <emph>Navigation</emph> toolbar by clicking on its icon located in the vertical scrollbar. You can break the toolbar away from its place by dragging and arrange it on the screen.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_NAVI_VS" id="bm_id3154622" localize="false"/>
<paragraph role="paragraph" id="par_id3153141" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="HID_NAVI_VS">Click the icon for the type of objects you want to browse through. Then click one of the "Previous Object" or "Next Object" arrow buttons. The names of these buttons indicate the type of object you have selected. The text cursor is placed on whichever object you have selected.</ahelp></paragraph>
-<paragraph role="tip" id="par_id3149968" xml-lang="en-US" l10n="CHG" oldref="11">You can configure $[officename] according to your specific preferences for navigating within a document. To do this, choose <link href="text/shared/01/06140000.xhp" name="Tools - Configuration"><emph>Tools - Configuration</emph></link>. The various tables for adapting <link href="text/shared/01/06140100.xhp" name="menus">menus</link>, <link href="text/shared/01/06140200.xhp" name="keyboard input">keyboard input</link> or toolbars contain various functions for navigation within the document under the "Navigate" area. In this way you can jump to the index tags in the document with the "To Next/Previous Index Tag" functions.</paragraph>
+<paragraph role="tip" id="par_id3149968" xml-lang="en-US" l10n="CHG" oldref="11">You can configure $[officename] according to your specific preferences for navigating within a document. To do this, choose <link href="text/shared/01/06140000.xhp" name="Tools - Customize"><emph>Tools - Customize</emph></link>. The various tables for adapting <link href="text/shared/01/06140100.xhp" name="menus">menus</link>, <link href="text/shared/01/06140200.xhp" name="keyboard input">keyboard input</link> or toolbars contain various functions for navigation within the document under the "Navigate" area. In this way you can jump to the index tags in the document with the "To Next/Previous Index Tag" functions.</paragraph>
<bookmark xml-lang="en-US" branch="index" id="bm_id3155338"><bookmark_value>searching; repeating a search</bookmark_value>
</bookmark>
<paragraph role="heading" id="hd_id3155338" xml-lang="en-US" level="2" l10n="U" oldref="8">Repeat Search</paragraph>
@@ -97,7 +97,7 @@
<paragraph role="paragraph" id="par_idN10857" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select this icon to browse through search results.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_NID_TABLE_FORMULA" id="bm_id7630237" localize="false"/>
<paragraph role="paragraph" id="par_idN1086E" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select this icon to browse through table formulas.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_NID_FORMULA_ERROR" id="bm_id7151402" localize="false"/>
+<!-- removed HID HID_NID_FORMULA_ERROR -->
<bookmark xml-lang="en-US" branch="hid/HID_NID_TABLE_FORMULA_ERROR" id="bm_id8653523" localize="false"/>
<paragraph role="paragraph" id="par_idN10885" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select this icon to browse through wrong table formulas.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_NID_TBL" id="bm_id4498428" localize="false"/>
diff --git a/helpcontent2/source/text/swriter/01/02120000.xhp b/helpcontent2/source/text/swriter/01/02120000.xhp
index dc39806541..46f743b6a6 100644
--- a/helpcontent2/source/text/swriter/01/02120000.xhp
+++ b/helpcontent2/source/text/swriter/01/02120000.xhp
@@ -52,15 +52,15 @@
<embed href="text/swriter/guide/autotext.xhp#autotext"/>
<paragraph role="heading" id="hd_id3148982" xml-lang="en-US" level="2" l10n="U" oldref="4">AutoText</paragraph>
<paragraph role="paragraph" id="par_id3153640" xml-lang="en-US" l10n="U" oldref="5">The <emph>AutoText </emph>dialog lists the AutoText categories and entries.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_GLOSSARY:CB_INSERT_TIP" id="bm_id3152778" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_GLOSSARY:CB_INSERT_TIP" id="bm_id3152778" localize="false"/>
<paragraph role="heading" id="hd_id3152766" xml-lang="en-US" level="3" l10n="U" oldref="6">Display remainder of name as a suggestion while typing</paragraph>
<paragraph role="paragraph" id="par_id3145758" xml-lang="en-US" l10n="CHG" oldref="51"><ahelp hid="SW:CHECKBOX:DLG_GLOSSARY:CB_INSERT_TIP">Displays a suggestion for completing a word as a Help Tip after you type the first three letters of a word that matches an AutoText entry. To accept the suggestion, press Enter. If more than one AutoText entry matches the letters that you type, press Ctrl+Tab to advance through the entries.</ahelp> For example, to insert dummy text, type "Dum", and then press Enter.</paragraph>
<paragraph role="paragraph" id="par_id3149177" xml-lang="en-US" l10n="U" oldref="53">To display the list in reverse order, press <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Tab.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_GLOSSARY:ED_NAME" id="bm_id3155856" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_GLOSSARY:ED_NAME" id="bm_id3155856" localize="false"/>
<paragraph role="heading" id="hd_id3151378" xml-lang="en-US" level="3" l10n="U" oldref="9">Name</paragraph>
<paragraph role="paragraph" id="par_id3155862" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:EDIT:DLG_GLOSSARY:ED_NAME">Lists the name of the currently selected AutoText entry. If you have selected text in the document, type the name of the new AutoText entry, click the <emph>AutoText </emph>button, and then choose <emph>New</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_GLOSSARY:ED_SHORTNAME" id="bm_id3150124" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_GLOSSARY:ED_SHORTNAME" id="bm_id3150124" localize="false"/>
<paragraph role="heading" id="hd_id3150113" xml-lang="en-US" level="3" l10n="U" oldref="12">Shortcut</paragraph>
<paragraph role="paragraph" id="par_id3147413" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SW:EDIT:DLG_GLOSSARY:ED_SHORTNAME">Displays the shortcut for the selected AutoText entry. If you are creating a new AutoText entry, type the shortcut that you want to use for the entry.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149558" xml-lang="en-US" level="3" l10n="U" oldref="65">List box</paragraph>
@@ -70,7 +70,7 @@
<paragraph role="paragraph" id="par_id3156094" xml-lang="en-US" l10n="U" oldref="15">Inserts the selected AutoText into the current document.</paragraph>
<paragraph role="note" id="par_id3148788" xml-lang="en-US" l10n="U" oldref="75">If you insert an unformatted AutoText entry into a paragraph, the entry is formatted with the current paragraph style.</paragraph>
<embed href="text/shared/00/00000001.xhp#schliessen"/>
-<bookmark xml-lang="en-US" branch="hid/SW:MENUBUTTON:DLG_GLOSSARY:PB_EDIT" id="bm_id3153121" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MenuButton:DLG_GLOSSARY:PB_EDIT" id="bm_id3153121" localize="false"/>
<paragraph role="heading" id="hd_id3150039" xml-lang="en-US" level="2" l10n="U" oldref="17">AutoText</paragraph>
<paragraph role="paragraph" id="par_id3153127" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:MENUBUTTON:DLG_GLOSSARY:PB_EDIT">Click to display additional AutoText commands, for example, to create a new AutoText entry from a text selection in the current document.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_MD_GLOS_DEFINE" id="bm_id3154628" localize="false"/>
@@ -99,41 +99,41 @@
<bookmark xml-lang="en-US" branch="hid/HID_MD_GLOS_IMPORT" id="bm_id3156263" localize="false"/>
<paragraph role="heading" id="hd_id3149597" xml-lang="en-US" level="3" l10n="U" oldref="77">Import</paragraph>
<paragraph role="paragraph" id="par_id3148937" xml-lang="en-US" l10n="U" oldref="78"><ahelp hid="HID_MD_GLOS_IMPORT">Opens a dialog where you can select the MS 97/2000/XP Word document or template, containing the AutoText entries that you want to import.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_GLOSSARY:PB_BIB" id="bm_id3156049" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_GLOSSARY:PB_BIB" id="bm_id3156049" localize="false"/>
<paragraph role="heading" id="hd_id3156038" xml-lang="en-US" level="2" l10n="U" oldref="37">Categories</paragraph>
<paragraph role="paragraph" id="par_id3156055" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="SW:PUSHBUTTON:DLG_GLOSSARY:PB_BIB">Adds, renames, or deletes AutoText categories.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_BIB_BASE" id="bm_id3159229" localize="false"/>
<paragraph role="heading" id="hd_id3159217" xml-lang="en-US" level="2" l10n="U" oldref="54">Edit Categories</paragraph>
<paragraph role="paragraph" id="par_id3145173" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="HID_BIB_BASE">Adds, renames, or deletes AutoText categories.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_BIB_BASE:ED_NAME" id="bm_id3150796" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_BIB_BASE:ED_NAME" id="bm_id3150796" localize="false"/>
<paragraph role="heading" id="hd_id3145192" xml-lang="en-US" level="3" l10n="U" oldref="39">Category</paragraph>
<paragraph role="paragraph" id="par_id3150802" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid="SW:EDIT:DLG_BIB_BASE:ED_NAME">Displays the name of the selected AutoText category. To change the name of the category, type a new name, and then click <emph>Rename</emph>. To create a new category, type a name, and then click <emph>New</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_DLG_BIB_BASE_LB_PATH" id="bm_id3155328" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_BIB_BASE:LB_PATH" id="bm_id3155328" localize="false"/>
<paragraph role="heading" id="hd_id3155318" xml-lang="en-US" level="3" l10n="U" oldref="79">Path</paragraph>
<paragraph role="paragraph" id="par_id3155335" xml-lang="en-US" l10n="U" oldref="80"><ahelp hid="SW_LISTBOX_DLG_BIB_BASE_LB_PATH">Displays the current path to the directory where the selected AutoText category files are stored. If you are creating an AutoText category, select where you want to store the category files.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_BIB_BASE:PB_NEW" id="bm_id3154421" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_BIB_BASE:PB_NEW" id="bm_id3154421" localize="false"/>
<paragraph role="heading" id="hd_id3154410" xml-lang="en-US" level="3" l10n="U" oldref="41">New</paragraph>
<paragraph role="paragraph" id="par_id3154933" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SW:PUSHBUTTON:DLG_BIB_BASE:PB_NEW">Creates a new AutoText category using the name that you entered in the<emph> Name</emph> box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_BIB_BASE:PB_RENAME" id="bm_id3153372" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_BIB_BASE:PB_RENAME" id="bm_id3153372" localize="false"/>
<paragraph role="heading" id="hd_id3154959" xml-lang="en-US" level="3" l10n="U" oldref="67">Rename</paragraph>
<paragraph role="paragraph" id="par_id3153379" xml-lang="en-US" l10n="U" oldref="68"><ahelp hid="SW:PUSHBUTTON:DLG_BIB_BASE:PB_RENAME">Changes the name of the selected AutoText category to the name that you enter in the <emph>Name </emph>box.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_GLOS_GROUP_TREE" id="bm_id3154131" localize="false"/>
<paragraph role="heading" id="hd_id3154120" xml-lang="en-US" level="3" l10n="U" oldref="81">Selection list</paragraph>
<paragraph role="paragraph" id="par_id3154137" xml-lang="en-US" l10n="U" oldref="58"><ahelp hid="HID_GLOS_GROUP_TREE">Lists the existing AutoText categories and the corresponding paths.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#loeschen1"/>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_GLOSSARY:PB_PATH" id="bm_id3154845" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_GLOSSARY:PB_PATH" id="bm_id3154845" localize="false"/>
<paragraph role="heading" id="hd_id3145615" xml-lang="en-US" level="2" l10n="U" oldref="56">Path</paragraph>
<paragraph role="paragraph" id="par_id3154852" xml-lang="en-US" l10n="CHG" oldref="57"><ahelp hid="." visibility="hidden">Opens the Edit Paths dialog, where you can select the directory to store AutoText.</ahelp>Opens the <link href="text/shared/optionen/01010301.xhp" name="Edit Paths">Edit Paths</link> dialog, where you can select the directory to store AutoText.</paragraph>
<paragraph role="paragraph" id="par_id3156064" xml-lang="en-US" l10n="CHG" oldref="61">To add a new path to an AutoText directory, click the <emph>Path</emph> button in the <emph>AutoText </emph>dialog.</paragraph>
<paragraph role="heading" id="hd_id3155383" xml-lang="en-US" level="2" l10n="U" oldref="45">Save links relative to</paragraph>
<paragraph role="paragraph" id="par_id3155396" xml-lang="en-US" l10n="U" oldref="46">Use this area to set the way $[officename] inserts links to the AutoText directory. </paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_GLOSSARY:CB_FILE_REL" id="bm_id3148755" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_GLOSSARY:CB_FILE_REL" id="bm_id3148755" localize="false"/>
<paragraph role="heading" id="hd_id3148743" xml-lang="en-US" level="3" l10n="U" oldref="47">File system</paragraph>
<paragraph role="paragraph" id="par_id3148762" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="SW:CHECKBOX:DLG_GLOSSARY:CB_FILE_REL">Links to AutoText directories on your computer are relative.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_GLOSSARY:CB_NET_REL" id="bm_id3153031" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_GLOSSARY:CB_NET_REL" id="bm_id3153031" localize="false"/>
<paragraph role="heading" id="hd_id3153020" xml-lang="en-US" level="3" l10n="U" oldref="49">Internet</paragraph>
<paragraph role="paragraph" id="par_id3153037" xml-lang="en-US" l10n="U" oldref="50"><ahelp hid="SW:CHECKBOX:DLG_GLOSSARY:CB_NET_REL">Links to files on the Internet are relative.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_GLOSSARY:CB_SHOW_EXAMPLE" id="bm_id3154603" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_GLOSSARY:CB_SHOW_EXAMPLE" id="bm_id3154603" localize="false"/>
<paragraph role="heading" id="hd_id3154590" xml-lang="en-US" level="3" l10n="U" oldref="71">Show preview</paragraph>
<paragraph role="paragraph" id="par_id3154610" xml-lang="en-US" l10n="U" oldref="72"><ahelp hid="SW:CHECKBOX:DLG_GLOSSARY:CB_SHOW_EXAMPLE">Turns on or off a preview of the selected AutoText entry.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154909" xml-lang="en-US" level="3" l10n="U" oldref="69">Preview</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/02120100.xhp b/helpcontent2/source/text/swriter/01/02120100.xhp
index e5c1aafd67..c350b0b49c 100755
--- a/helpcontent2/source/text/swriter/01/02120100.xhp
+++ b/helpcontent2/source/text/swriter/01/02120100.xhp
@@ -45,11 +45,11 @@
<section id="howtoget">
<embed href="text/swriter/00/00000402.xhp#autotextum"/>
</section>
- <bookmark branch="hid/SW:EDIT:DLG_RENAME_GLOS:ED_ON" xml-lang="en-US" id="bm_id3155921"/><paragraph role="heading" level="2" id="hd_id3155910" l10n="U" xml-lang="en-US" oldref="3">Name</paragraph>
+ <bookmark branch="hid/sw:Edit:DLG_RENAME_GLOS:ED_ON" xml-lang="en-US" id="bm_id3155921"/><paragraph role="heading" level="2" id="hd_id3155910" l10n="U" xml-lang="en-US" oldref="3">Name</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3151372" xml-lang="en-US" oldref="4"><ahelp hid="SW:EDIT:DLG_RENAME_GLOS:ED_ON" visibility="visible">Displays the current name of the selected AutoText item.</ahelp></paragraph>
- <bookmark branch="hid/SW:EDIT:DLG_RENAME_GLOS:ED_NN" xml-lang="en-US" id="bm_id3155869"/><paragraph role="heading" level="2" id="hd_id3155858" l10n="U" xml-lang="en-US" oldref="5">New</paragraph>
+ <bookmark branch="hid/sw:Edit:DLG_RENAME_GLOS:ED_NN" xml-lang="en-US" id="bm_id3155869"/><paragraph role="heading" level="2" id="hd_id3155858" l10n="U" xml-lang="en-US" oldref="5">New</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3150686" xml-lang="en-US" oldref="6"><ahelp hid="SW:EDIT:DLG_RENAME_GLOS:ED_NN" visibility="visible">Type the new name for the selected AutoText component.</ahelp></paragraph>
- <bookmark branch="hid/SW:EDIT:DLG_RENAME_GLOS:ED_OS" xml-lang="en-US" id="bm_id3150122"/><bookmark branch="hid/SW:EDIT:DLG_RENAME_GLOS:ED_NS" xml-lang="en-US" id="bm_id3145576"/><paragraph role="heading" level="2" id="hd_id3150110" l10n="U" xml-lang="en-US" oldref="7">Shortcut</paragraph>
+ <bookmark branch="hid/sw:Edit:DLG_RENAME_GLOS:ED_OS" xml-lang="en-US" id="bm_id3150122"/><bookmark branch="hid/sw:Edit:DLG_RENAME_GLOS:ED_NS" xml-lang="en-US" id="bm_id3145576"/><paragraph role="heading" level="2" id="hd_id3150110" l10n="U" xml-lang="en-US" oldref="7">Shortcut</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3145583" xml-lang="en-US" oldref="8"><ahelp hid="SW:EDIT:DLG_RENAME_GLOS:ED_NS" visibility="visible">Assigns a shortcut to the selected AutoText entry.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/02140000.xhp b/helpcontent2/source/text/swriter/01/02140000.xhp
index 155d9f4e32..2fcf2080ad 100644
--- a/helpcontent2/source/text/swriter/01/02140000.xhp
+++ b/helpcontent2/source/text/swriter/01/02140000.xhp
@@ -56,7 +56,7 @@
<paragraph role="note" id="par_id3151371" xml-lang="en-US" l10n="U" oldref="13">The following dialog elements are only visible when the corresponding field type is selected.</paragraph>
<paragraph role="heading" id="hd_id3150687" xml-lang="en-US" level="2" l10n="U" oldref="56">Select</paragraph>
<paragraph role="paragraph" id="par_id3150700" xml-lang="en-US" l10n="U" oldref="57">Lists the field options, for example, "fixed". If you want, you can click another option for the selected field type.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DOK:LB_DOKNUMFORMAT" id="bm_id3155866" localize="false"/><paragraph role="heading" id="hd_id3155854" xml-lang="en-US" level="2" l10n="U" oldref="11">Format</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_DOK:LB_DOKNUMFORMAT" id="bm_id3155866" localize="false"/><paragraph role="heading" id="hd_id3155854" xml-lang="en-US" level="2" l10n="U" oldref="11">Format</paragraph>
<paragraph role="paragraph" id="par_id3147409" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:LISTBOX:TP_FLD_DOK:LB_DOKNUMFORMAT">Select the format for the contents of the field. For date, time, and user-defined fields, you can also click "Additional formats" in the list, and then choose a different format.</ahelp> The formats that are available depend on the type of field that you are editing.</paragraph>
<paragraph role="heading" id="hd_id3149556" xml-lang="en-US" level="2" l10n="U" oldref="24">Offset</paragraph>
<paragraph role="paragraph" id="par_id3145256" xml-lang="en-US" l10n="CHG" oldref="25">Displays the offset for the selected field type, for example, for "Next Page," "Page Numbers" or "Previous Page". You can enter a new offset value which will be added to the displayed page number.</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/02150000.xhp b/helpcontent2/source/text/swriter/01/02150000.xhp
index aaaeaa9aaa..73dc34d735 100644
--- a/helpcontent2/source/text/swriter/01/02150000.xhp
+++ b/helpcontent2/source/text/swriter/01/02150000.xhp
@@ -38,7 +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/sw:ModalDialog:DLG_INS_FOOTNOTE" id="bm_id3149483" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/FN_EDIT_FOOTNOTE" 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>
@@ -64,7 +64,7 @@
<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/sw:ImageButton:DLG_INS_FOOTNOTE:BT_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>
<table id="tbl_id3148791">
@@ -80,7 +80,7 @@
</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/sw:ImageButton:DLG_INS_FOOTNOTE:BT_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>
<table id="tbl_id3150662">
diff --git a/helpcontent2/source/text/swriter/01/02160000.xhp b/helpcontent2/source/text/swriter/01/02160000.xhp
index d6e9a4b7c9..45b7b977a7 100644
--- a/helpcontent2/source/text/swriter/01/02160000.xhp
+++ b/helpcontent2/source/text/swriter/01/02160000.xhp
@@ -51,7 +51,7 @@
</section>
<paragraph role="heading" id="hd_id3159193" xml-lang="en-US" level="2" l10n="U" oldref="3">Selection</paragraph>
<paragraph role="paragraph" id="par_id3149486" xml-lang="en-US" l10n="U" oldref="4">Edits the selected index entry.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:DLG_MULTMRK:LB_TOX" id="bm_id3143283" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_MULTMRK:LB_TOX" id="bm_id3143283" localize="false"/>
<paragraph role="heading" id="hd_id3143272" xml-lang="en-US" level="3" l10n="U" oldref="5">Index</paragraph>
<paragraph role="paragraph" id="par_id3151251" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:LISTBOX:DLG_MULTMRK:LB_TOX">Displays the type of index that the selected entry belongs to.</ahelp> You cannot change the index type of an index entry in this dialog. Instead, you must delete the index entry from the document, and then insert it again in a different index type.</paragraph>
<paragraph role="heading" id="hd_id3149107" xml-lang="en-US" level="3" l10n="U" oldref="7">Entry</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/02170000.xhp b/helpcontent2/source/text/swriter/01/02170000.xhp
index efc0c4b31f..8cc0207d78 100644
--- a/helpcontent2/source/text/swriter/01/02170000.xhp
+++ b/helpcontent2/source/text/swriter/01/02170000.xhp
@@ -57,7 +57,7 @@
<paragraph role="paragraph" id="par_id3149040" xml-lang="en-US" l10n="U" oldref="6">The current write protection status of a section is indicated by the lock symbol in front of the section name in the list. An open lock is unprotected and a closed lock is protected. Similarly, visible sections are indicated by a glasses symbol.</paragraph>
<paragraph role="heading" id="hd_id3153638" xml-lang="en-US" level="2" l10n="U" oldref="20">Options</paragraph>
<paragraph role="paragraph" id="par_id3152773" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="HID_REGION_TREE">Opens the <link href="text/swriter/01/05040501.xhp" name="Options"><emph>Options</emph></link> dialog, where you can edit the column layout, background, footnote and endnote behavior of the selected section.</ahelp> If the section is password protected, you must enter the password first.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:MD_EDIT_REGION:CB_DISMISS" id="bm_id3156269" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:MD_EDIT_REGION:CB_DISMISS" id="bm_id3156269" localize="false"/>
<paragraph role="heading" id="hd_id3155143" xml-lang="en-US" level="2" l10n="CHG" oldref="16">Remove</paragraph>
<paragraph role="paragraph" id="par_id3145413" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SW:PUSHBUTTON:MD_EDIT_REGION:CB_DISMISS">Removes the selected section from the document, and inserts the contents of the section into the document.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/swriter/01/04010000.xhp b/helpcontent2/source/text/swriter/01/04010000.xhp
index 8dbee50bb4..6f24ea7eb9 100644
--- a/helpcontent2/source/text/swriter/01/04010000.xhp
+++ b/helpcontent2/source/text/swriter/01/04010000.xhp
@@ -50,25 +50,25 @@
</section>
<paragraph role="heading" id="hd_id3151176" xml-lang="en-US" level="2" l10n="U" oldref="4">Type</paragraph>
<paragraph role="paragraph" id="par_id3145420" xml-lang="en-US" l10n="U" oldref="5">Select the type of break that you want to insert.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_BREAK:RB_LINE" id="bm_id3154108" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_BREAK:RB_LINE" id="bm_id3154108" localize="false"/>
<paragraph role="heading" id="hd_id3154097" xml-lang="en-US" level="3" l10n="U" oldref="6">Line Break</paragraph>
<paragraph role="paragraph" id="par_id3149805" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SW:RADIOBUTTON:DLG_BREAK:RB_LINE">Ends the current line, and moves the text found to the right of the cursor to the next line, without creating a new paragraph.</ahelp></paragraph>
<paragraph role="tip" id="par_id3149685" xml-lang="en-US" l10n="U" oldref="8">You can also insert a line break by pressing Shift+Enter.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_BREAK:RB_COL" id="bm_id3155176" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_BREAK:RB_COL" id="bm_id3155176" localize="false"/>
<paragraph role="heading" id="hd_id3148566" xml-lang="en-US" level="3" l10n="U" oldref="9">Column Break</paragraph>
<paragraph role="paragraph" id="par_id3155182" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:RADIOBUTTON:DLG_BREAK:RB_COL">Inserts a manual column break (in a multiple column layout), and moves the text found to the right of the cursor to the beginning of the next <link href="text/swriter/01/05040500.xhp" name="column">column</link>. A manual column break is indicated by a nonprinting border at the top of the new column.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_BREAK:RB_PAGE" id="bm_id3149096" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_BREAK:RB_PAGE" id="bm_id3149096" localize="false"/>
<paragraph role="heading" id="hd_id3149487" xml-lang="en-US" level="3" l10n="U" oldref="11">Page Break</paragraph>
<paragraph role="paragraph" id="par_id3149102" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:RADIOBUTTON:DLG_BREAK:RB_PAGE">Inserts a manual page break, and moves the text found to the right of the cursor to the beginning of the next page. The inserted page break is indicated by a nonprinting border at the top of the new page.</ahelp></paragraph>
<paragraph role="tip" id="par_id3145758" xml-lang="en-US" l10n="U" oldref="13">You can also insert a page break by pressing <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter. However, if you want to assign the following page a different Page Style, you must use the menu command to insert the manual page break.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:DLG_BREAK:LB_COLL" id="bm_id3156270" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_BREAK:LB_COLL" id="bm_id3156270" localize="false"/>
<paragraph role="heading" id="hd_id3149175" xml-lang="en-US" level="3" l10n="U" oldref="14">Style</paragraph>
<paragraph role="paragraph" id="par_id3156275" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SW:LISTBOX:DLG_BREAK:LB_COLL">Select the page style for the page that follows the manual page break.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_BREAK:CB_PAGENUM" id="bm_id3155911" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_BREAK:CB_PAGENUM" id="bm_id3155911" localize="false"/>
<paragraph role="heading" id="hd_id3145782" xml-lang="en-US" level="3" l10n="U" oldref="16">Change page number</paragraph>
<paragraph role="paragraph" id="par_id3155917" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SW:CHECKBOX:DLG_BREAK:CB_PAGENUM">Assigns the page number that you specify to the page that follows the manual page break. This option is only available if you assign a different page style to the page that follows manual page break.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:DLG_BREAK:ED_PAGENUM" id="bm_id3150693" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_BREAK:ED_PAGENUM" id="bm_id3150693" localize="false"/>
<paragraph role="heading" id="hd_id3151384" xml-lang="en-US" level="3" l10n="U" oldref="20">Page number</paragraph>
<paragraph role="paragraph" id="par_id3150700" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SW:NUMERICFIELD:DLG_BREAK:ED_PAGENUM">Enter the new page number for the page that follows the manual page break.</ahelp></paragraph>
<paragraph role="note" id="par_id3150554" xml-lang="en-US" l10n="U" oldref="18">To display manual breaks, choose <link href="text/swriter/01/03100000.xhp" name="View - Nonprinting Characters"><emph>View - Nonprinting Characters</emph></link>.</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/04020000.xhp b/helpcontent2/source/text/swriter/01/04020000.xhp
index b3aa8020c2..9dec2f948c 100644
--- a/helpcontent2/source/text/swriter/01/04020000.xhp
+++ b/helpcontent2/source/text/swriter/01/04020000.xhp
@@ -42,7 +42,7 @@
<body>
<bookmark xml-lang="en-US" branch="hid/FN_INSERT_REGION" id="bm_id7648447" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:InsertSection" id="bm_id3149809" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/FN_INSERT_COLUMN_SECTION" id="bm_id3153527" localize="false"/>
+<!-- removed HID FN_INSERT_COLUMN_SECTION -->
<paragraph role="heading" id="hd_id3154108" xml-lang="en-US" level="1" l10n="U" oldref="1">
<variable id="bereicheinfuegen"><link href="text/swriter/01/04020000.xhp" name="Insert Section">Insert Section</link>
</variable></paragraph>
diff --git a/helpcontent2/source/text/swriter/01/04020100.xhp b/helpcontent2/source/text/swriter/01/04020100.xhp
index 35fb6365fe..e1527b9781 100644
--- a/helpcontent2/source/text/swriter/01/04020100.xhp
+++ b/helpcontent2/source/text/swriter/01/04020100.xhp
@@ -50,17 +50,17 @@
<section id="howtoget">
<embed href="text/swriter/00/00000404.xhp#bereicheinbereich"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SW:COMBOBOX:TP_INSERT_SECTION:ED_RNAME" id="bm_id3145413" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_MD_EDIT_REGION_ED_RANAME" id="bm_id8467970" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:TP_INSERT_SECTION:ED_RNAME" id="bm_id3145413" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:MD_EDIT_REGION:ED_RANAME" id="bm_id8467970" localize="false"/>
<paragraph role="heading" id="hd_id3151170" xml-lang="en-US" level="2" l10n="U" oldref="6">New Section</paragraph>
<paragraph role="paragraph" id="par_id3145420" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SW:COMBOBOX:TP_INSERT_SECTION:ED_RNAME">Type a name for the new section.</ahelp> By default, $[officename] automatically assigns the name "Section X" to new sections, where X is a consecutive number.</paragraph>
<paragraph role="heading" id="hd_id3154102" xml-lang="en-US" level="2" l10n="U" oldref="8">Link</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:TRISTATEBOX:MD_EDIT_REGION:CB_FILE" id="bm_id3153532" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_INSERT_SECTION:CB_FILE" id="bm_id3153536" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:TriStateBox:MD_EDIT_REGION:CB_FILE" id="bm_id3153532" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_INSERT_SECTION:CB_FILE" id="bm_id3153536" localize="false"/>
<paragraph role="heading" id="hd_id3149806" xml-lang="en-US" level="3" l10n="U" oldref="20">Link</paragraph>
<paragraph role="paragraph" id="par_id3154472" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SW:CHECKBOX:TP_INSERT_SECTION:CB_FILE">Inserts the contents of another document or section from another document in the current section.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_INSERT_SECTION:CB_DDE" id="bm_id3154569" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:MD_EDIT_REGION:CB_DDE" id="bm_id3154573" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_INSERT_SECTION:CB_DDE" id="bm_id3154569" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:MD_EDIT_REGION:CB_DDE" id="bm_id3154573" localize="false"/>
<switch select="sys">
<case select="WIN">
<paragraph role="heading" id="hd_id3153672" xml-lang="en-US" level="3" l10n="U" oldref="26">DDE<comment>UFI: WIN only, while fixing #109638#</comment></paragraph>
@@ -69,41 +69,41 @@
<paragraph role="paragraph" id="par_id3149098" xml-lang="en-US" l10n="U" oldref="35">For example, to insert a section named "Section1" from a $[officename] text document abc.sxw as a DDE link, use the command: "soffice x:\abc.sxw Section1". To insert the contents of the first cell from a MS Excel spreadsheet file called "abc.xls", use the command: "excel x:\[abc.xls]Sheet1 z1s1". You can also copy the elements that you want to insert as a DDE link, and then <emph>Edit - Paste Special</emph>. You can then view the DDE command for the link, by selecting the contents and choosing <emph>Edit - Fields</emph>.</paragraph>
</case>
</switch>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_INSERT_SECTION:ED_FILE" id="bm_id3149038" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:MD_EDIT_REGION:ED_FILE" id="bm_id3149042" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_INSERT_SECTION:ED_FILE" id="bm_id3149038" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:MD_EDIT_REGION:ED_FILE" id="bm_id3149042" localize="false"/>
<paragraph role="heading" id="hd_id3153640" xml-lang="en-US" level="3" l10n="U" oldref="28">File name<switchinline select="sys"><caseinline select="WIN"> / DDE command
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3145754" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SW:EDIT:MD_EDIT_REGION:ED_FILE">Enter the path and the filename for the file that you want to insert, or click the browse button (<emph>...</emph>) to locate the file.</ahelp><switchinline select="sys"><caseinline select="WIN">If the <emph>DDE </emph>check box is selected, enter the DDE command that you want to use.
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_INSERT_SECTION:PB_FILE" id="bm_id3155148" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:MD_EDIT_REGION:PB_FILE" id="bm_id3156266" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_INSERT_SECTION:PB_FILE" id="bm_id3155148" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:MD_EDIT_REGION:PB_FILE" id="bm_id3156266" localize="false"/>
<paragraph role="heading" id="hd_id3155136" xml-lang="en-US" level="3" l10n="U" oldref="39">...</paragraph>
<paragraph role="paragraph" id="par_id3156274" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid="SW:PUSHBUTTON:MD_EDIT_REGION:PB_FILE">Locate the file that you want to insert as a link, and then click <emph>Insert</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:COMBOBOX:TP_INSERT_SECTION:LB_SUBREG" id="bm_id3145781" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:COMBOBOX:MD_EDIT_REGION:LB_SUBREG" id="bm_id3145785" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:TP_INSERT_SECTION:LB_SUBREG" id="bm_id3145781" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:MD_EDIT_REGION:LB_SUBREG" id="bm_id3145785" localize="false"/>
<paragraph role="heading" id="hd_id3149180" xml-lang="en-US" level="3" l10n="U" oldref="23">Section</paragraph>
<paragraph role="paragraph" id="par_id3155910" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SW:COMBOBOX:MD_EDIT_REGION:LB_SUBREG">Select the section in the file that you want to insert as a link.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3151373" xml-lang="en-US" l10n="U" oldref="25">When you open a document that contains linked sections, you are prompted to update the links.</paragraph>
<paragraph role="heading" id="hd_id3150687" xml-lang="en-US" level="2" l10n="U" oldref="43">Write Protection</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_INSERT_SECTION:CB_PROTECT" id="bm_id3155864" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:TRISTATEBOX:MD_EDIT_REGION:CB_PROTECT" id="bm_id3155868" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_INSERT_SECTION:CB_PROTECT" id="bm_id3155864" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:TriStateBox:MD_EDIT_REGION:CB_PROTECT" id="bm_id3155868" localize="false"/>
<paragraph role="heading" id="hd_id3150700" xml-lang="en-US" level="3" l10n="U" oldref="10">Protected</paragraph>
<paragraph role="paragraph" id="par_id3150110" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SW:TRISTATEBOX:MD_EDIT_REGION:CB_PROTECT">Prevents the selected section from being edited.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_INSERT_SECTION_CB_PASSWD" id="bm_id3145273" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_INSERT_SECTION:CB_PASSWD" id="bm_id3145273" localize="false"/>
<paragraph role="heading" id="hd_id3145261" xml-lang="en-US" level="3" l10n="U" oldref="44">With password</paragraph>
<paragraph role="paragraph" id="par_id3149555" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="SW_CHECKBOX_TP_INSERT_SECTION_CB_PASSWD">Protects the selected section with a password. The password must have a minimum of 5 characters.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_PUSHBUTTON_MD_EDIT_REGION_PB_PASSWD" id="bm_id3150561" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_PUSHBUTTON_TP_INSERT_SECTION_PB_PASSWD" id="bm_id3147735" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:MD_EDIT_REGION:PB_PASSWD" id="bm_id3150561" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_INSERT_SECTION:PB_PASSWD" id="bm_id3147735" localize="false"/>
<paragraph role="heading" id="hd_id3150549" xml-lang="en-US" level="3" l10n="U" oldref="46">...</paragraph>
<paragraph role="paragraph" id="par_id3147742" xml-lang="en-US" l10n="U" oldref="47"><ahelp hid="SW_PUSHBUTTON_TP_INSERT_SECTION_PB_PASSWD">Opens a dialog where you can change the current password.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3146333" xml-lang="en-US" level="2" l10n="U" oldref="48">Hide</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_INSERT_SECTION:CB_HIDE" id="bm_id3149843" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:TRISTATEBOX:MD_EDIT_REGION:CB_HIDE" id="bm_id3149847" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_INSERT_SECTION:CB_HIDE" id="bm_id3149843" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:TriStateBox:MD_EDIT_REGION:CB_HIDE" id="bm_id3149847" localize="false"/>
<paragraph role="heading" id="hd_id3149830" xml-lang="en-US" level="3" l10n="U" oldref="12">Hide</paragraph>
<paragraph role="paragraph" id="par_id3148849" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SW:TRISTATEBOX:MD_EDIT_REGION:CB_HIDE">Hides and prevents the selected section from being printed.</ahelp> The components of a hidden sections appear gray in the Navigator. When you rest your mouse pointer over a hidden component in the Navigator, the Help tip "hidden" is displayed.</paragraph>
<paragraph role="note" id="par_id3155074" xml-lang="en-US" l10n="U" oldref="50">You cannot hide a section if it is the only content on a page, or in a header, footer, footnote, frame, or table cell.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_INSERT_SECTION:ED_CONDITION" id="bm_id3154334" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:MD_EDIT_REGION:ED_CONDITION" id="bm_id3154338" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_INSERT_SECTION:ED_CONDITION" id="bm_id3154334" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:MD_EDIT_REGION:ED_CONDITION" id="bm_id3154338" localize="false"/>
<paragraph role="heading" id="hd_id3154323" xml-lang="en-US" level="3" l10n="U" oldref="16">With condition</paragraph>
<paragraph role="paragraph" id="par_id3154343" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SW:EDIT:MD_EDIT_REGION:ED_CONDITION">Enter the condition that must be met to hide the section.</ahelp> A condition is a <link href="text/swriter/01/04090200.xhp" name="logical expression">logical expression</link>, such as "SALUTATION EQ Mr.". For example, if you use the <link href="text/swriter/guide/form_letters_main.xhp" name="mail merge">mail merge</link> form letter feature to define a database field called "Salutation" that contains "Mr.", "Ms.", or "Sir or Madam", you can then specify that a section will only be printed if the salutation is "Mr.".</paragraph>
<paragraph role="paragraph" id="par_id3150086" xml-lang="en-US" l10n="U" oldref="18">Another example would be to create the field variable "x" and set its value to 1. Then specify a condition based on this variable for hiding a section, such as: "x eq 1". If you want to display the section, set the value of the variable "x" to "0".</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/04020200.xhp b/helpcontent2/source/text/swriter/01/04020200.xhp
index a967ad6468..2541c5759d 100755
--- a/helpcontent2/source/text/swriter/01/04020200.xhp
+++ b/helpcontent2/source/text/swriter/01/04020200.xhp
@@ -47,10 +47,10 @@
<section id="howtoget">
<embed href="text/swriter/00/00000404.xhp#sectionindents"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SW_METRICFIELD_TP_SECTION_INDENTS_MF_BEFORE" id="bm_id3149818" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_SECTION_INDENTS:MF_BEFORE" id="bm_id3149818" localize="false"/>
<paragraph role="heading" id="hd_id3149488" xml-lang="en-US" level="2" l10n="U" oldref="3">Before section</paragraph>
<paragraph role="paragraph" id="par_id3149824" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SW_METRICFIELD_TP_SECTION_INDENTS_MF_BEFORE">Specifies the indents before the section, at the left margin.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_METRICFIELD_TP_SECTION_INDENTS_MF_AFTER" id="bm_id3151258" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_SECTION_INDENTS:MF_AFTER" id="bm_id3151258" localize="false"/>
<paragraph role="heading" id="hd_id3149108" xml-lang="en-US" level="2" l10n="U" oldref="5">After section</paragraph>
<paragraph role="paragraph" id="par_id3148970" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW_METRICFIELD_TP_SECTION_INDENTS_MF_AFTER">Specifies the indents after the section, at the right margin.</ahelp></paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/helpcontent2/source/text/swriter/01/04030000.xhp b/helpcontent2/source/text/swriter/01/04030000.xhp
index 620f3b4ed5..1964a56ca5 100644
--- a/helpcontent2/source/text/swriter/01/04030000.xhp
+++ b/helpcontent2/source/text/swriter/01/04030000.xhp
@@ -54,27 +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/sw:RadioButton:DLG_INS_FOOTNOTE:RB_NUMBER_AUTO" 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>.
</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/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"/>
<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.
</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/sw:PushButton:DLG_INS_FOOTNOTE:BT_NUMBER_CHAR" 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>
</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/sw:RadioButton:DLG_INS_FOOTNOTE:RB_TYPE_FTN" 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/FN_INSERT_ENDNOTE" 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"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_INS_FOOTNOTE:RB_TYPE_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>
<embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/helpcontent2/source/text/swriter/01/04040000.xhp b/helpcontent2/source/text/swriter/01/04040000.xhp
index 223dec571c..fda6971125 100644
--- a/helpcontent2/source/text/swriter/01/04040000.xhp
+++ b/helpcontent2/source/text/swriter/01/04040000.xhp
@@ -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>
+<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>
<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>
+<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>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/04060000.xhp b/helpcontent2/source/text/swriter/01/04060000.xhp
index 4ac0da2283..b24899a27b 100644
--- a/helpcontent2/source/text/swriter/01/04060000.xhp
+++ b/helpcontent2/source/text/swriter/01/04060000.xhp
@@ -53,24 +53,24 @@
</section>
<paragraph role="heading" id="hd_id3154098" xml-lang="en-US" level="2" l10n="U" oldref="3">Properties</paragraph>
<paragraph role="paragraph" id="par_id3149804" xml-lang="en-US" l10n="U" oldref="4">Set the caption options for the current selection.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:COMBOBOX:DLG_CAPTION:BOX_CATEGORY" id="bm_id3154567" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:DLG_CAPTION:BOX_CATEGORY" id="bm_id3154567" localize="false"/>
<paragraph role="heading" id="hd_id3153533" xml-lang="en-US" level="3" l10n="U" oldref="5">Category</paragraph>
<paragraph role="paragraph" id="par_id3154574" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:COMBOBOX:DLG_CAPTION:BOX_CATEGORY">Select the caption category, or type a name to create a new category. The category text appears before the caption number in the caption label. Each predefined caption category is formatted with a paragraph style of the same name. </ahelp> For example, the "Illustration" caption category is formatted with the "Illustration" paragraph style.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:DLG_CAPTION:BOX_FORMAT" id="bm_id3152956" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_CAPTION:BOX_FORMAT" id="bm_id3152956" localize="false"/>
<paragraph role="heading" id="hd_id3153675" xml-lang="en-US" level="3" l10n="U" oldref="7">Numbering</paragraph>
<paragraph role="paragraph" id="par_id3152962" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:LISTBOX:DLG_CAPTION:BOX_FORMAT">Select the type of numbering that you want to use in the caption.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_CAPTION:EDT_TEXT" id="bm_id3155905" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_CAPTION:EDT_TEXT" id="bm_id3155905" localize="false"/>
<paragraph role="heading" id="hd_id3155893" xml-lang="en-US" level="3" l10n="CHG" oldref="9">Caption</paragraph>
<paragraph role="paragraph" id="par_id3149688" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:EDIT:DLG_CAPTION:EDT_TEXT">Type the text that you want to appear after the caption number.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_DLG_CAPTION_EDT_SEP" id="bm_id7607959" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_CAPTION:EDT_SEP" id="bm_id7607959" localize="false"/>
<paragraph role="heading" id="par_idN1068A" xml-lang="en-US" level="3" l10n="NEW">Separator</paragraph>
<paragraph role="paragraph" id="par_idN10690" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter optional text characters to appear between the number and the caption text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_ListBox_DLG_CAPTION_BOX_POS" id="bm_id4664754" localize="false"/><comment>moved help id to here</comment>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_CAPTION:BOX_POS" id="bm_id4664754" localize="false"/><comment>moved help id to here</comment>
<paragraph role="heading" id="hd_id3154199" xml-lang="en-US" level="3" l10n="U" oldref="11">Position</paragraph>
<paragraph role="paragraph" id="par_id3149486" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SW:LISTBOX:DLG_CAPTION:BOX_POS">Adds the caption above or below the selected item. This option is only available for some objects.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149043" xml-lang="en-US" level="2" l10n="U" oldref="29"><link href="text/swriter/01/04060100.xhp" name="Options">Options</link></paragraph>
<embed href="text/swriter/01/04060100.xhp#optionentext"/>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_CAPTION_BTN_AUTOCAPTION" id="bm_id72939" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_CAPTION:BTN_AUTOCAPTION" id="bm_id72939" localize="false"/>
<paragraph role="heading" id="par_idN10744" xml-lang="en-US" level="2" l10n="NEW">AutoCaption</paragraph>
<paragraph role="paragraph" id="par_idN1074A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Caption dialog. It has the same information as the dialog you get by menu %PRODUCTNAME Writer - AutoCaption in the Options dialog box.</ahelp></paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/helpcontent2/source/text/swriter/01/04060100.xhp b/helpcontent2/source/text/swriter/01/04060100.xhp
index 022a2efcd9..03bbab141e 100755
--- a/helpcontent2/source/text/swriter/01/04060100.xhp
+++ b/helpcontent2/source/text/swriter/01/04060100.xhp
@@ -43,7 +43,7 @@ UFI: edited re spec "Enhance Caption Dialog in Writer"</lastedited>
</history>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_CAPTION:BTN_OPTION" id="bm_id3151170" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_CAPTION:BTN_OPTION" id="bm_id3151170" localize="false"/>
<paragraph role="heading" id="hd_id3149287" xml-lang="en-US" level="1" l10n="CHG" oldref="1">Options</paragraph>
<paragraph role="paragraph" id="par_id3151177" xml-lang="en-US" l10n="U" oldref="2"><variable id="optionentext"><ahelp hid="SW:PUSHBUTTON:DLG_CAPTION:BTN_OPTION">Adds the chapter number to the caption label. To use this feature, you must first assign an <link href="text/swriter/guide/chapter_numbering.xhp" name="outline level">outline level</link> to a paragraph style, and then apply the style to the chapter headings in your document.</ahelp>
</variable></paragraph>
@@ -52,18 +52,18 @@ UFI: edited re spec "Enhance Caption Dialog in Writer"</lastedited>
</section>
<paragraph role="heading" id="hd_id3149805" xml-lang="en-US" level="2" l10n="U" oldref="3">Numbering by chapter</paragraph>
<paragraph role="paragraph" id="par_id3153532" xml-lang="en-US" l10n="U" oldref="4">When you add chapter numbers to caption labels, the caption numbering is reset when a chapter heading is encountered. For example, if the last figure in chapter 1 is "Figure 1.12", the first figure in the next chapter would be "Figure 2.1".</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:DLG_SEQUENCE_OPTION:LB_LEVEL" id="bm_id3154479" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_SEQUENCE_OPTION:LB_LEVEL" id="bm_id3154479" localize="false"/>
<paragraph role="heading" id="hd_id3154574" xml-lang="en-US" level="3" l10n="U" oldref="5">Level</paragraph>
<paragraph role="paragraph" id="par_id3152954" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:LISTBOX:DLG_SEQUENCE_OPTION:LB_LEVEL">Select the number of outline levels from the top of the chapter hierarchy down to include in the caption label.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_SEQUENCE_OPTION:ED_SEPARATOR" id="bm_id3153672" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_SEQUENCE_OPTION:ED_SEPARATOR" id="bm_id3153672" localize="false"/>
<paragraph role="heading" id="hd_id3151316" xml-lang="en-US" level="3" l10n="U" oldref="7">Separator</paragraph>
<paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:EDIT:DLG_SEQUENCE_OPTION:ED_SEPARATOR">Enter the character that you want to insert between the chapter number and the caption number.</ahelp></paragraph>
<paragraph role="heading" id="par_idN10633" xml-lang="en-US" level="2" l10n="NEW">Category and frame format</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_ListBox_DLG_SEQUENCE_OPTION_LB_CHARSTYLE" id="bm_id8001037" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_SEQUENCE_OPTION:LB_CHARSTYLE" id="bm_id8001037" localize="false"/>
<paragraph role="heading" id="par_idN10639" xml-lang="en-US" level="3" l10n="NEW">Character style</paragraph>
<paragraph role="paragraph" id="par_idN1063F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the character style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_CAPTION:CB_COPY_ATTR" id="bm_id3149820" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_DLG_SEQUENCE_OPTION_CB_APPLYBAS" id="bm_id2826013" localize="false"/>
+<!-- removed HID SW:CHECKBOX:DLG_CAPTION:CB_COPY_ATTR -->
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_SEQUENCE_OPTION:CB_APPLYBAS" id="bm_id2826013" localize="false"/>
<paragraph role="heading" id="hd_id3143280" xml-lang="en-US" level="3" l10n="U" oldref="43">Apply border and shadow</paragraph>
<paragraph role="paragraph" id="par_id3149826" xml-lang="en-US" l10n="CHG" oldref="44"><ahelp hid="SW:CHECKBOX:DLG_CAPTION:CB_COPY_ATTR">Applies the border and shadow of the object to the caption frame.</ahelp></paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/helpcontent2/source/text/swriter/01/04070100.xhp b/helpcontent2/source/text/swriter/01/04070100.xhp
index 268eb814d4..07b580f1cd 100755
--- a/helpcontent2/source/text/swriter/01/04070100.xhp
+++ b/helpcontent2/source/text/swriter/01/04070100.xhp
@@ -47,15 +47,15 @@
<section id="howtoget">
<embed href="text/swriter/00/00000404.xhp#umschlagb"/>
</section>
- <bookmark branch="hid/SW:MULTILINEEDIT:TP_ENV_ENV:EDT_ADDR" xml-lang="en-US" id="bm_id3151178"/><paragraph role="heading" level="2" id="hd_id3149295" l10n="U" xml-lang="en-US" oldref="3">Addressee</paragraph>
+ <bookmark branch="hid/sw:MultiLineEdit:TP_ENV_ENV:EDT_ADDR" xml-lang="en-US" id="bm_id3151178"/><paragraph role="heading" level="2" id="hd_id3149295" l10n="U" xml-lang="en-US" oldref="3">Addressee</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3145415" xml-lang="en-US" oldref="4"><ahelp hid="SW:MULTILINEEDIT:TP_ENV_ENV:EDT_ADDR" visibility="visible">Enter the delivery address.</ahelp> You can also click in this box, and select a database, a table, and field, and then click the arrow button to insert the field in the address. If you want, you can apply formatting, such as bold and underline, to the address text.</paragraph>
- <bookmark branch="hid/SW:CHECKBOX:TP_ENV_ENV:BOX_SEND" xml-lang="en-US" id="bm_id3149802"/><bookmark branch="hid/SW:MULTILINEEDIT:TP_ENV_ENV:EDT_SEND" xml-lang="en-US" id="bm_id3149806"/><paragraph role="heading" level="2" id="hd_id3154102" l10n="U" xml-lang="en-US" oldref="5">Sender</paragraph>
+ <bookmark branch="hid/sw:CheckBox:TP_ENV_ENV:BOX_SEND" xml-lang="en-US" id="bm_id3149802"/><bookmark branch="hid/sw:MultiLineEdit:TP_ENV_ENV:EDT_SEND" xml-lang="en-US" id="bm_id3149806"/><paragraph role="heading" level="2" id="hd_id3154102" l10n="U" xml-lang="en-US" oldref="5">Sender</paragraph>
<paragraph l10n="U" xml-lang="en-US" role="paragraph" id="par_id3153527" oldref="6"><ahelp visibility="visible" hid="SW:MULTILINEEDIT:TP_ENV_ENV:EDT_SEND">Includes a return address on the envelope. Select the <emph>Sender </emph>check box, and then enter the return address.</ahelp> $[officename] automatically inserts your user data in the <emph>Sender </emph>box, but you can also enter the data that you want.</paragraph>
- <bookmark branch="hid/SW:LISTBOX:TP_ENV_ENV:LB_DATABASE" xml-lang="en-US" id="bm_id3154474"/><paragraph role="heading" level="2" id="hd_id3154571" l10n="U" xml-lang="en-US" oldref="9">Database</paragraph>
+ <bookmark branch="hid/sw:ListBox:TP_ENV_ENV:LB_DATABASE" xml-lang="en-US" id="bm_id3154474"/><paragraph role="heading" level="2" id="hd_id3154571" l10n="U" xml-lang="en-US" oldref="9">Database</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3154480" xml-lang="en-US" oldref="10"><ahelp hid="SW:LISTBOX:TP_ENV_ENV:LB_DATABASE" visibility="visible">Select the database containing the address data that you want to insert.</ahelp></paragraph>
- <bookmark branch="hid/SW:LISTBOX:TP_ENV_ENV:LB_TABLE" xml-lang="en-US" id="bm_id3155892"/><paragraph role="heading" level="2" id="hd_id3151310" l10n="U" xml-lang="en-US" oldref="11">Table</paragraph>
+ <bookmark branch="hid/sw:ListBox:TP_ENV_ENV:LB_TABLE" xml-lang="en-US" id="bm_id3155892"/><paragraph role="heading" level="2" id="hd_id3151310" l10n="U" xml-lang="en-US" oldref="11">Table</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3155898" xml-lang="en-US" oldref="12"><ahelp hid="SW:LISTBOX:TP_ENV_ENV:LB_TABLE" visibility="visible">Select the database table containing the address data that you want to insert.</ahelp></paragraph>
- <bookmark branch="hid/SW:LISTBOX:TP_ENV_ENV:LB_DBFIELD" xml-lang="en-US" id="bm_id3154197"/><bookmark branch="hid/SW:IMAGEBUTTON:TP_ENV_ENV:BTN_INSERT" xml-lang="en-US" id="bm_id3154201"/><paragraph role="heading" level="2" id="hd_id3149695" l10n="U" xml-lang="en-US" oldref="13">Database field</paragraph>
+ <bookmark branch="hid/sw:ListBox:TP_ENV_ENV:LB_DBFIELD" xml-lang="en-US" id="bm_id3154197"/><bookmark branch="hid/sw:ImageButton:TP_ENV_ENV:BTN_INSERT" xml-lang="en-US" id="bm_id3154201"/><paragraph role="heading" level="2" id="hd_id3149695" l10n="U" xml-lang="en-US" oldref="13">Database field</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3155180" xml-lang="en-US" oldref="14"><ahelp hid="SW:IMAGEBUTTON:TP_ENV_ENV:BTN_INSERT" visibility="visible">Select the database field containing the address data that you want to insert, and then click the left arrow button. The data is added to the address box containing the cursor.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#vorschau"/>
</body>
diff --git a/helpcontent2/source/text/swriter/01/04070200.xhp b/helpcontent2/source/text/swriter/01/04070200.xhp
index 658f9026a5..11e549e84b 100755
--- a/helpcontent2/source/text/swriter/01/04070200.xhp
+++ b/helpcontent2/source/text/swriter/01/04070200.xhp
@@ -51,11 +51,11 @@
<paragraph role="paragraph" id="par_id3154105" xml-lang="en-US" l10n="U" oldref="43">Sets the position and the text formatting options of the addressee field.</paragraph>
<paragraph role="heading" id="hd_id3153527" xml-lang="en-US" level="2" l10n="U" oldref="3">Position</paragraph>
<paragraph role="paragraph" id="par_id3154563" xml-lang="en-US" l10n="U" oldref="4">Sets the position of the recipient's address on the envelope.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_ENV_FMT:FLD_ADDR_LEFT" id="bm_id3154482" localize="false"/><paragraph role="heading" id="hd_id3154471" xml-lang="en-US" level="3" l10n="U" oldref="15">from left</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_ENV_FMT:FLD_ADDR_LEFT" id="bm_id3154482" localize="false"/><paragraph role="heading" id="hd_id3154471" xml-lang="en-US" level="3" l10n="U" oldref="15">from left</paragraph>
<paragraph role="paragraph" id="par_id3152957" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW:METRICFIELD:TP_ENV_FMT:FLD_ADDR_LEFT">Enter the amount of space that you want to leave between the left edge of the envelope and the addressee field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_ENV_FMT:FLD_ADDR_TOP" id="bm_id3153675" localize="false"/><paragraph role="heading" id="hd_id3151319" xml-lang="en-US" level="3" l10n="U" oldref="17">from top</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_ENV_FMT:FLD_ADDR_TOP" id="bm_id3153675" localize="false"/><paragraph role="heading" id="hd_id3151319" xml-lang="en-US" level="3" l10n="U" oldref="17">from top</paragraph>
<paragraph role="paragraph" id="par_id3155895" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:METRICFIELD:TP_ENV_FMT:FLD_ADDR_TOP">Enter the amount of space that you want to leave between the top edge of the envelope and the addressee field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:MENUBUTTON:TP_ENV_FMT:BTN_ADDR_EDIT" id="bm_id3154195" localize="false"/><paragraph role="heading" id="hd_id3149692" xml-lang="en-US" level="2" l10n="CHG" oldref="5">Edit</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:MenuButton:TP_ENV_FMT:BTN_ADDR_EDIT" id="bm_id3154195" localize="false"/><paragraph role="heading" id="hd_id3149692" xml-lang="en-US" level="2" l10n="CHG" oldref="5">Edit</paragraph>
<paragraph role="paragraph" id="par_id3154201" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:MENUBUTTON:TP_ENV_FMT:BTN_ADDR_EDIT">Click and choose the text formatting style for the addressee field that you want to edit.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3143272" xml-lang="en-US" level="4" l10n="U" oldref="7">Character</paragraph>
<paragraph role="paragraph" id="par_id3149481" xml-lang="en-US" l10n="U" oldref="8">Opens a dialog where you can edit the character formatting that is used in the addressee field.</paragraph>
@@ -65,11 +65,11 @@
<paragraph role="paragraph" id="par_id3149107" xml-lang="en-US" l10n="U" oldref="45">Sets the position and the text formatting options of the sender field.</paragraph>
<paragraph role="heading" id="hd_id3148980" xml-lang="en-US" level="2" l10n="U" oldref="46">Position</paragraph>
<paragraph role="paragraph" id="par_id3149041" xml-lang="en-US" l10n="U" oldref="47">Sets the position of the sender's address on the envelope.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_ENV_FMT:FLD_SEND_LEFT" id="bm_id3152769" localize="false"/><paragraph role="heading" id="hd_id3153636" xml-lang="en-US" level="3" l10n="U" oldref="29">from left</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_ENV_FMT:FLD_SEND_LEFT" id="bm_id3152769" localize="false"/><paragraph role="heading" id="hd_id3153636" xml-lang="en-US" level="3" l10n="U" oldref="29">from left</paragraph>
<paragraph role="paragraph" id="par_id3152776" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SW:METRICFIELD:TP_ENV_FMT:FLD_SEND_LEFT">Enter the amount of space that you want to leave between the left edge of the envelope and the sender field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_ENV_FMT:FLD_SEND_TOP" id="bm_id3155142" localize="false"/><paragraph role="heading" id="hd_id3145766" xml-lang="en-US" level="3" l10n="U" oldref="31">from top</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_ENV_FMT:FLD_SEND_TOP" id="bm_id3155142" localize="false"/><paragraph role="heading" id="hd_id3145766" xml-lang="en-US" level="3" l10n="U" oldref="31">from top</paragraph>
<paragraph role="paragraph" id="par_id3155149" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SW:METRICFIELD:TP_ENV_FMT:FLD_SEND_TOP">Enter the amount of space that you want to leave between the top edge of the envelope and the sender field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:MENUBUTTON:TP_ENV_FMT:BTN_SEND_EDIT" id="bm_id3156274" localize="false"/><paragraph role="heading" id="hd_id3149179" xml-lang="en-US" level="2" l10n="CHG" oldref="19">Edit</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:MenuButton:TP_ENV_FMT:BTN_SEND_EDIT" id="bm_id3156274" localize="false"/><paragraph role="heading" id="hd_id3149179" xml-lang="en-US" level="2" l10n="CHG" oldref="19">Edit</paragraph>
<paragraph role="paragraph" id="par_id3156281" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW:MENUBUTTON:TP_ENV_FMT:BTN_SEND_EDIT">Click and choose the text formatting style for the sender field that you want to edit.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3145787" xml-lang="en-US" level="4" l10n="U" oldref="21">Character</paragraph>
<paragraph role="paragraph" id="par_id3155918" xml-lang="en-US" l10n="U" oldref="22">Opens a dialog where you can edit the character formatting that is used in the sender field.</paragraph>
@@ -77,11 +77,11 @@
<paragraph role="paragraph" id="par_id3150112" xml-lang="en-US" l10n="U" oldref="26">Opens a dialog where you can edit the paragraph formatting that is used in the sender field.</paragraph>
<paragraph role="heading" id="hd_id3150687" xml-lang="en-US" level="2" l10n="U" oldref="34">Size</paragraph>
<paragraph role="paragraph" id="par_id3150700" xml-lang="en-US" l10n="U" oldref="35">Select the envelope size format that you want to use, or create a custom size.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_ENV_FMT_BOX_SIZE_FORMAT" id="bm_id3147416" localize="false"/><paragraph role="heading" id="hd_id3155868" xml-lang="en-US" level="3" l10n="U" oldref="36">Format</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_ENV_FMT:BOX_SIZE_FORMAT" id="bm_id3147416" localize="false"/><paragraph role="heading" id="hd_id3155868" xml-lang="en-US" level="3" l10n="U" oldref="36">Format</paragraph>
<paragraph role="paragraph" id="par_id3147422" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="SW_LISTBOX_TP_ENV_FMT_BOX_SIZE_FORMAT">Select the envelope size that want, or select "User Defined", and then enter the width and the height of the custom size.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_METRICFIELD_TP_ENV_FMT_FLD_SIZE_WIDTH" id="bm_id3145268" localize="false"/><paragraph role="heading" id="hd_id3145256" xml-lang="en-US" level="3" l10n="U" oldref="38">Width</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_ENV_FMT:FLD_SIZE_WIDTH" id="bm_id3145268" localize="false"/><paragraph role="heading" id="hd_id3145256" xml-lang="en-US" level="3" l10n="U" oldref="38">Width</paragraph>
<paragraph role="paragraph" id="par_id3149551" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="SW_METRICFIELD_TP_ENV_FMT_FLD_SIZE_WIDTH">Enter the width of the envelope.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_METRICFIELD_TP_ENV_FMT_FLD_SIZE_HEIGHT" id="bm_id3150554" localize="false"/><paragraph role="heading" id="hd_id3149567" xml-lang="en-US" level="3" l10n="U" oldref="40">Height</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_ENV_FMT:FLD_SIZE_HEIGHT" id="bm_id3150554" localize="false"/><paragraph role="heading" id="hd_id3149567" xml-lang="en-US" level="3" l10n="U" oldref="40">Height</paragraph>
<paragraph role="paragraph" id="par_id3150561" xml-lang="en-US" l10n="U" oldref="41"><ahelp hid="SW_METRICFIELD_TP_ENV_FMT_FLD_SIZE_HEIGHT">Enter the height of the envelope.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#vorschau"/>
</body>
diff --git a/helpcontent2/source/text/swriter/01/04070300.xhp b/helpcontent2/source/text/swriter/01/04070300.xhp
index f61b50b254..f01bd4f7db 100755
--- a/helpcontent2/source/text/swriter/01/04070300.xhp
+++ b/helpcontent2/source/text/swriter/01/04070300.xhp
@@ -67,21 +67,21 @@
<bookmark xml-lang="en-US" branch="hid/ITM_VER_RGHT" id="bm_id3153644" localize="false"/>
<paragraph role="heading" id="hd_id3153633" xml-lang="en-US" level="2" l10n="U" oldref="15">Vertical right</paragraph>
<paragraph role="paragraph" id="par_id3149037" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="ITM_VER_RGHT">Feeds the envelope vertically from the right edge of the printer tray.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_ENV_PRT:BTN_TOP" id="bm_id3145757" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_ENV_PRT:BTN_TOP" id="bm_id3145757" localize="false"/>
<paragraph role="heading" id="hd_id3152773" xml-lang="en-US" level="2" l10n="U" oldref="17">Print from top</paragraph>
<paragraph role="paragraph" id="par_id3145763" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:RADIOBUTTON:TP_ENV_PRT:BTN_TOP">Feeds the envelope with the print side face up in the printer tray.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_ENV_PRT:BTN_BOTTOM" id="bm_id3149171" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_ENV_PRT:BTN_BOTTOM" id="bm_id3149171" localize="false"/>
<paragraph role="heading" id="hd_id3155146" xml-lang="en-US" level="2" l10n="U" oldref="19">Print from bottom</paragraph>
<paragraph role="paragraph" id="par_id3149178" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW:RADIOBUTTON:TP_ENV_PRT:BTN_BOTTOM">Feeds the envelope with the print side face down in the printer tray.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_ENV_PRT:FLD_RIGHT" id="bm_id3145778" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_ENV_PRT:FLD_RIGHT" id="bm_id3145778" localize="false"/>
<paragraph role="heading" id="hd_id3156279" xml-lang="en-US" level="2" l10n="U" oldref="21">Shift right</paragraph>
<paragraph role="paragraph" id="par_id3145784" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SW:METRICFIELD:TP_ENV_PRT:FLD_RIGHT">Enter the amount to shift the print area to the right.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_ENV_PRT:FLD_DOWN" id="bm_id3151378" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_ENV_PRT:FLD_DOWN" id="bm_id3151378" localize="false"/>
<paragraph role="heading" id="hd_id3155921" xml-lang="en-US" level="2" l10n="U" oldref="23">Shift down</paragraph>
<paragraph role="paragraph" id="par_id3151383" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SW:METRICFIELD:TP_ENV_PRT:FLD_DOWN">Enter the amount to shift the print area down.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3150123" xml-lang="en-US" level="2" l10n="U" oldref="25">Current printer</paragraph>
<paragraph role="paragraph" id="par_id3150696" xml-lang="en-US" l10n="U" oldref="26">Displays the name of the current printer.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_ENV_PRT:BTN_PRTSETUP" id="bm_id3147411" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_ENV_PRT:BTN_PRTSETUP" id="bm_id3147411" localize="false"/>
<paragraph role="heading" id="hd_id3155862" xml-lang="en-US" level="2" l10n="U" oldref="27">Setup</paragraph>
<paragraph role="paragraph" id="par_id3147418" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SW:PUSHBUTTON:TP_ENV_PRT:BTN_PRTSETUP">Opens the Print Setup dialog where you can define additional printer settings, such as paper format and orientation.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/swriter/01/04090001.xhp b/helpcontent2/source/text/swriter/01/04090001.xhp
index 7380ce9672..43820c0cf2 100644
--- a/helpcontent2/source/text/swriter/01/04090001.xhp
+++ b/helpcontent2/source/text/swriter/01/04090001.xhp
@@ -48,7 +48,7 @@
</section>
<paragraph xml-lang="en-US" id="par_id3154470" role="note" l10n="U" oldref="3">For the HTML export and import of date and time fields, <link href="text/swriter/01/04090007.xhp#datumuhrzeit" name="special $[officename] formats">special $[officename] formats</link> are used.</paragraph>
<section id="feldtyp">
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DOK:LB_DOKTYPE" id="bm_id3153666" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_DOK:LB_DOKTYPE" id="bm_id3153666" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3151312" role="heading" level="2" l10n="U" oldref="4">Type</paragraph>
<paragraph xml-lang="en-US" id="par_id3153672" role="paragraph" l10n="U" oldref="5"><ahelp hid="SW:LISTBOX:TP_FLD_DOK:LB_DOKTYPE">Lists the available field types. To add a field to your document, click a field type, click a field in the <emph>Select </emph>list, and then click <emph>Insert</emph>.</ahelp> The following fields are available:</paragraph>
</section>
@@ -140,7 +140,7 @@
<paragraph xml-lang="en-US" id="par_id3154631" role="note" l10n="U" oldref="26">The following fields can only be inserted if the corresponding field type is selected in the <emph>Type </emph>list.</paragraph>
</section>
<section id="auswahl">
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DOK:LB_DOKSELECTION" id="bm_id3150671" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_DOK:LB_DOKSELECTION" id="bm_id3150671" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3150660" role="heading" level="2" l10n="CHG"
oldref="27">Select<comment>on "Document" and "DocInformation" tab page this is called "Select", on the other tab pages "Selection"</comment></paragraph>
<paragraph xml-lang="en-US" id="par_id3150678" role="paragraph" l10n="U" oldref="28"><ahelp hid="SW:LISTBOX:TP_FLD_DOK:LB_DOKSELECTION">Lists the available fields for the field type selected in the <emph>Type </emph>list. To insert a field, click the field, and then click <emph>Insert</emph>.</ahelp></paragraph>
@@ -185,14 +185,14 @@
<paragraph xml-lang="en-US" id="par_id3145188" role="paragraph" l10n="U" oldref="39">If you want, you can enter an <emph>Offset </emph>for the displayed page number. With an <emph>Offset</emph> value of 1, the field will display a number that is 1 more than the current page number, but only if a page with that number exists. On the last page of the document, this same field will be empty.</paragraph>
</section>
<section id="korrektur">
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FLD_DOK:ED_DOKVALUE" id="bm_id3150903" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FLD_DOK:ED_DOKVALUE" id="bm_id3150903" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3150891" role="heading" level="2" l10n="U"
oldref="45">Offset</paragraph>
<paragraph xml-lang="en-US" id="par_id3155312" role="paragraph" l10n="U" oldref="46"><ahelp hid="SW:EDIT:TP_FLD_DOK:ED_DOKVALUE">Enter the offset value that you want to apply to a page number field, for example "+1".</ahelp></paragraph>
</section>
<paragraph xml-lang="en-US" id="par_id3154948" role="tip" l10n="U" oldref="54">If you want to change the actual page number and not the displayed number, do not use the <emph>Offset</emph> value. To change page numbers, read the <link href="text/swriter/guide/pagenumbers.xhp" name="Page Numbers"><emph>Page Numbers</emph></link> guide.</paragraph>
<section id="format">
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DOK:LB_DOKFORMAT" id="bm_id3145607" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_DOK:LB_DOKFORMAT" id="bm_id3145607" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3145595" role="heading" level="2" l10n="U"
oldref="41">Format</paragraph>
<paragraph xml-lang="en-US" id="par_id3145613" role="paragraph" l10n="U" oldref="42"><ahelp hid="SW:LISTBOX:TP_FLD_DOK:LB_DOKFORMAT">Click the format that you want to apply to the selected field, or click "Additional formats" to define a custom format.</ahelp></paragraph>
@@ -229,14 +229,14 @@
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FLD_DOK:CB_DOKFIXEDCONTENT" id="bm_id3153014" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FLD_DOK:CB_DOKFIXEDCONTENT" id="bm_id3153014" localize="false"/>
<paragraph xml-lang="en-US" id="par_id0902200804313432" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Inserts the field as static content, that is, the field cannot be updated.</ahelp></paragraph>
<embed href="text/swriter/01/04090004.xhp#inhaltfix"/>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_FLD_DOK:ED_DOKLEVEL" id="bm_id3153038" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_FLD_DOK:ED_DOKLEVEL" id="bm_id3153038" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3153026" role="heading" level="2" l10n="U"
oldref="43">Layer</paragraph>
<paragraph xml-lang="en-US" id="par_id3154580" role="paragraph" l10n="U" oldref="44"><ahelp hid="SW:NUMERICFIELD:TP_FLD_DOK:ED_DOKLEVEL">Select the chapter heading level that you want to include in the selected field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_FLD_DOK:ED_DOKDATEOFF" id="bm_id3154610" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_FLD_DOK:ED_DOKDATEOFF" id="bm_id3154610" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3154598" role="heading" level="2" l10n="U"
oldref="51">Offset in days/minutes</paragraph>
<paragraph xml-lang="en-US" id="par_id3154899" role="paragraph" l10n="U" oldref="52"><ahelp hid="SW:NUMERICFIELD:TP_FLD_DOK:ED_DOKDATEOFF">Enter the offset that you want to apply to a date or time field.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/swriter/01/04090002.xhp b/helpcontent2/source/text/swriter/01/04090002.xhp
index 328f6d5dd1..1bee300a97 100644
--- a/helpcontent2/source/text/swriter/01/04090002.xhp
+++ b/helpcontent2/source/text/swriter/01/04090002.xhp
@@ -51,7 +51,7 @@
<embed href="text/swriter/00/00000404.xhp#feldreferenzen"/>
</section>
<embed href="text/swriter/guide/references.xhp#references"/>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_REF:LB_REFTYPE" id="bm_id3145772" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_REF:LB_REFTYPE" id="bm_id3145772" localize="false"/>
<paragraph role="heading" id="hd_id4333628" xml-lang="en-US" level="2" l10n="NEW">Type</paragraph>
<paragraph role="paragraph" id="par_id4516129" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Lists the available field types. To add a field to your document, click a field type, click a field in the Selection list, and then click Insert.</ahelp> The following fields are available:</paragraph>
<table id="tbl_id3145784">
@@ -126,7 +126,7 @@
</table>
<paragraph role="tip" id="par_id3154772" xml-lang="en-US" l10n="U" oldref="18">References are fields. To remove a reference, delete the field. If you set a longer text as a reference and you do not want to reenter it after deleting the reference, select the text and copy it to the clipboard. You can then reinsert it as "unformatted text" at the same position using the command <emph>Edit - Paste special</emph>. The text remains intact while the reference is deleted.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_REF:LB_REFSELECTION" id="bm_id3146957" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_REF:LB_REFSELECTION" id="bm_id3146957" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_REFSELECTION_TOOLTIP" id="bm_id1661427" localize="false"/>
<paragraph role="heading" id="hd_id5824152" xml-lang="en-US" level="2" l10n="NEW">Selection<comment>on "Document" and "DocInformation" tab page this is called "Select", on the other tab pages "Selection"</comment></paragraph>
<paragraph role="paragraph" id="par_id7374187" xml-lang="en-US" l10n="CHG"><ahelp hid="SW:LISTBOX:TP_FLD_DOK:LB_DOKSELECTION">Lists the available fields for the field type selected in the <emph>Type </emph>list. To insert a field, click the field, select a format in the "Insert reference to" list, and then click <emph>Insert</emph>.</ahelp></paragraph>
@@ -134,7 +134,7 @@
</caseinline><defaultinline>Ctrl</defaultinline></switchinline> and double-click the field.</paragraph>
<section id="format">
<paragraph role="paragraph" id="par_id2171086" xml-lang="en-US" l10n="CHG">In the <emph>Insert reference to</emph> list, click the format that you want to use.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_REF:LB_REFFORMAT" id="bm_id3154344" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_REF:LB_REFFORMAT" id="bm_id3154344" localize="false"/>
<paragraph role="heading" id="hd_id3154333" xml-lang="en-US" level="2" l10n="CHG" oldref="21">Insert reference to</paragraph>
<paragraph role="paragraph" id="par_id3148786" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SW:LISTBOX:TP_FLD_REF:LB_REFFORMAT">Select the format that you want to use for the selected reference field.</ahelp> The following formats are available:</paragraph>
<table id="tbl_id3150090">
@@ -240,12 +240,12 @@
<paragraph role="note" id="par_id5189062" xml-lang="en-US" l10n="CHG">For example, when you are in a chapter 1, subchapter 2, subpart 5, this may be numbered as 1.2.5. When you insert here a reference to text in the previous subpart "1.2.4" and you apply the "Number" format, then the reference will be shown as "4". If in this example the numbering is set to show more sublevels, the same reference will be shown as "2.4" or "1.2.4", depending on the setting. If you use the "Number (full context)" format, you will always see "1.2.4", no matter how the numbered paragraph is formatted.</paragraph>
</section>
<section id="name">
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FLD_REF:ED_REFNAME" id="bm_id3156253" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FLD_REF:ED_REFNAME" id="bm_id3156253" localize="false"/>
<paragraph role="heading" id="hd_id3156242" xml-lang="en-US" level="2" l10n="U" oldref="13">Name</paragraph>
<paragraph role="paragraph" id="par_id3156259" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW:EDIT:TP_FLD_REF:ED_REFNAME">Type the name of the user-defined field that you want to create.</ahelp> To set a target, click "Set Reference" in the <emph>Type</emph> list, type a name in this box, and then click <emph>Insert</emph>. To reference the new target, click the target name in the <emph>Selection</emph> list.</paragraph>
</section>
<paragraph role="paragraph" id="par_id3156032" xml-lang="en-US" l10n="U" oldref="17">In a master document, targets that are in different sub-documents are not displayed in the<emph> Selection</emph> list. If you want to insert a reference to the target, you must type the path and the name in the <emph>Name </emph>box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FLD_REF:ED_REFVALUE" id="bm_id3159204" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FLD_REF:ED_REFVALUE" id="bm_id3159204" localize="false"/>
<paragraph role="paragraph" id="par_id0903200802250745" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the contents that you want to add to a user-defined fields.</ahelp></paragraph>
<embed href="text/swriter/01/04090001.xhp#wert"/>
<paragraph role="paragraph" id="par_id3159216" xml-lang="en-US" l10n="U" oldref="15">If you select text in the document, and then insert a reference, the selected text becomes the contents of the field that you insert.</paragraph><comment>Value box (always disabled)</comment>
diff --git a/helpcontent2/source/text/swriter/01/04090003.xhp b/helpcontent2/source/text/swriter/01/04090003.xhp
index a08352fb0a..6eb9494153 100644
--- a/helpcontent2/source/text/swriter/01/04090003.xhp
+++ b/helpcontent2/source/text/swriter/01/04090003.xhp
@@ -41,15 +41,15 @@
<section id="funktionen">
<bookmark xml-lang="en-US" branch="hid/HID_FLD_FUNC" id="bm_id3156382" localize="false"/>
<paragraph role="heading" id="hd_id3149123" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/04090003.xhp" name="Functions">Functions</link></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_EDIT_TP_FLD_FUNC_ED_FUNCNAME" id="bm_id3149875" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_EDIT_TP_FLD_FUNC_ED_FUNCVALUE" id="bm_id3150251" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FLD_FUNC:ED_FUNCNAME" id="bm_id3149875" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FLD_FUNC:ED_FUNCVALUE" id="bm_id3150251" localize="false"/>
<paragraph role="paragraph" id="par_id3150343" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="SW_EDIT_TP_FLD_FUNC_ED_FUNCVALUE" visibility="hidden">Sets additional function parameters for fields. The type of parameter depends on the field type that you select.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3151242" xml-lang="en-US" l10n="U" oldref="2">Depending on the field type that you select, you can assign conditions to certain functions. For example, you can define a field that executes a macro when you click the field in the document, or a condition that, when met, hides a field. You can also define placeholder fields that insert graphics, tables, frames and other objects into your document when needed.</paragraph>
</section>
<section id="howtoget">
<embed href="text/swriter/00/00000404.xhp#feldfunktionen"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_FUNC_LB_FUNCTYPE" id="bm_id3146964" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_FUNC:LB_FUNCTYPE" id="bm_id3146964" localize="false"/>
<paragraph role="paragraph" id="par_id0902200804352037" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Lists the available field types. To add a field to your document, click a field type, click a field in the <emph>Select </emph>list, and then click <emph>Insert</emph>.</ahelp></paragraph>
<embed href="text/swriter/01/04090001.xhp#feldtyp"/>
<table id="tbl_id3147403">
@@ -127,7 +127,7 @@
</tablerow>
</table>
<embed href="text/swriter/01/04090001.xhp#hinweis"/>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_FUNC_LB_FUNCFORMAT" id="bm_id3149307" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_FUNC:LB_FUNCFORMAT" id="bm_id3149307" localize="false"/>
<paragraph role="paragraph" id="par_id0902200804352213" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click the format that you want to apply to the selected field, or click "Additional formats" to define a custom format.</ahelp></paragraph>
<embed href="text/swriter/01/04090001.xhp#format"/>
<paragraph role="paragraph" id="par_id3151329" xml-lang="en-US" l10n="U" oldref="17">For function fields, the format field is only used for fields of the type placeholder. Here, the format determines the object for which the placeholder stands.</paragraph>
@@ -135,8 +135,8 @@
<paragraph role="heading" id="hd_id3149494" xml-lang="en-US" level="2" l10n="U" oldref="18">Condition</paragraph>
<paragraph role="paragraph" id="par_id3143281" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SW:EDIT:TP_FLD_DB:ED_DBCONDITION">For fields linked to a <link href="text/swriter/01/04090200.xhp" name="condition">condition</link>, enter the criteria here.</ahelp></paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/SW_EDIT_TP_FLD_FUNC_ED_FUNCCOND1" id="bm_id3151259" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_EDIT_TP_FLD_FUNC_ED_FUNCCOND2" id="bm_id3151262" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FLD_FUNC:ED_FUNCCOND1" id="bm_id3151259" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FLD_FUNC:ED_FUNCCOND2" id="bm_id3151262" localize="false"/>
<paragraph role="heading" id="hd_id3151248" xml-lang="en-US" level="2" l10n="U" oldref="20">Then, Else</paragraph>
<paragraph role="paragraph" id="par_id3154830" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SW_EDIT_TP_FLD_FUNC_ED_FUNCCOND2">Enter the text to display when the condition is met in the <emph>Then </emph>box, and the text to display when the condition is not met in the <emph>Else </emph>box.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3146865" xml-lang="en-US" l10n="U" oldref="22">You can also insert database fields in the <emph>Then </emph>and <emph>Else </emph>boxes using the format "databasename.tablename.fieldname".</paragraph>
@@ -159,40 +159,40 @@
<paragraph role="heading" id="hd_id3156369" xml-lang="en-US" level="2" l10n="U" oldref="41">Value</paragraph>
<paragraph role="paragraph" id="par_id3151370" xml-lang="en-US" l10n="U" oldref="44">Enter a value for the selected field.</paragraph>
<section id="makro">
-<bookmark xml-lang="en-US" branch="hid/SW_PUSHBUTTON_TP_FLD_FUNC_BT_FUNCMACRO" id="bm_id3148889" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_FLD_FUNC:BT_FUNCMACRO" id="bm_id3148889" localize="false"/>
<paragraph role="heading" id="hd_id3148877" xml-lang="en-US" level="2" l10n="U" oldref="36">Macro</paragraph>
<paragraph role="paragraph" id="par_id3155912" xml-lang="en-US" l10n="CHG" oldref="37"><ahelp hid="SW_PUSHBUTTON_TP_FLD_FUNC_BT_FUNCMACRO">Opens the <emph>Macro Selector</emph>, where you can choose the macro that will run when you click the selected field in the document.</ahelp> This button is only available for the "Execute macro" function field.</paragraph>
</section>
<paragraph role="paragraph" id="par_id3150111" xml-lang="en-US" l10n="U" oldref="49">The following controls are displayed for <emph>Input list</emph> fields:</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_EDIT_TP_FLD_FUNC_ED_LISTITEM" id="bm_id3155871" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FLD_FUNC:ED_LISTITEM" id="bm_id3155871" localize="false"/>
<paragraph role="heading" id="hd_id3155860" xml-lang="en-US" level="2" l10n="U" oldref="50">Item</paragraph>
<paragraph role="paragraph" id="par_id3150688" xml-lang="en-US" l10n="U" oldref="51"><ahelp hid="SW_EDIT_TP_FLD_FUNC_ED_LISTITEM">Enter a new item.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_PUSHBUTTON_TP_FLD_FUNC_PB_LISTADD" id="bm_id3147425" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_FLD_FUNC:PB_LISTADD" id="bm_id3147425" localize="false"/>
<paragraph role="heading" id="hd_id3147413" xml-lang="en-US" level="2" l10n="U" oldref="52">Add</paragraph>
<paragraph role="paragraph" id="par_id3147473" xml-lang="en-US" l10n="U" oldref="53"><ahelp hid="SW_PUSHBUTTON_TP_FLD_FUNC_PB_LISTADD">Adds the <emph>Item</emph> to the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_FUNC_LB_LISTITEMS" id="bm_id3147612" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_FUNC:LB_LISTITEMS" id="bm_id3147612" localize="false"/>
<paragraph role="heading" id="hd_id3147496" xml-lang="en-US" level="2" l10n="U" oldref="54">Items on list</paragraph>
<paragraph role="paragraph" id="par_id3147618" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="SW_LISTBOX_TP_FLD_FUNC_LB_LISTITEMS">Lists the items. The topmost item is shown in the document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_PUSHBUTTON_TP_FLD_FUNC_PB_LISTREMOVE" id="bm_id3149552" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_FLD_FUNC:PB_LISTREMOVE" id="bm_id3149552" localize="false"/>
<paragraph role="heading" id="hd_id3145263" xml-lang="en-US" level="2" l10n="U" oldref="56">Remove</paragraph>
<paragraph role="paragraph" id="par_id3149558" xml-lang="en-US" l10n="U" oldref="57"><ahelp hid="SW_PUSHBUTTON_TP_FLD_FUNC_PB_LISTREMOVE">Removes the selected item from the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_PUSHBUTTON_TP_FLD_FUNC_PB_LISTUP" id="bm_id3155964" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_FLD_FUNC:PB_LISTUP" id="bm_id3155964" localize="false"/>
<paragraph role="heading" id="hd_id3145126" xml-lang="en-US" level="2" l10n="U" oldref="58">Move Up</paragraph>
<paragraph role="paragraph" id="par_id3155970" xml-lang="en-US" l10n="U" oldref="59"><ahelp hid="SW_PUSHBUTTON_TP_FLD_FUNC_PB_LISTUP">Moves the selected item up in the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_PUSHBUTTON_TP_FLD_FUNC_PB_LISTDOWN" id="bm_id3150562" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_FLD_FUNC:PB_LISTDOWN" id="bm_id3150562" localize="false"/>
<paragraph role="heading" id="hd_id3150549" xml-lang="en-US" level="2" l10n="U" oldref="60">Move Down</paragraph>
<paragraph role="paragraph" id="par_id3156221" xml-lang="en-US" l10n="U" oldref="61"><ahelp hid="SW_PUSHBUTTON_TP_FLD_FUNC_PB_LISTDOWN">Moves the selected item down in the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_EDIT_TP_FLD_FUNC_ED_LISTNAME" id="bm_id3149226" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FLD_FUNC:ED_LISTNAME" id="bm_id3149226" localize="false"/>
<paragraph role="heading" id="hd_id3149215" xml-lang="en-US" level="2" l10n="U" oldref="62">Name</paragraph>
<paragraph role="paragraph" id="par_id3147733" xml-lang="en-US" l10n="U" oldref="63"><ahelp hid="SW_EDIT_TP_FLD_FUNC_ED_LISTNAME">Enter a unique name for the <emph>Input list</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_DLG_FLD_DROPDOWN_LB_LISTITEMS" id="bm_id3146344" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_FLD_DROPDOWN:LB_LISTITEMS" id="bm_id3146344" localize="false"/>
<paragraph role="heading" id="hd_id3146332" xml-lang="en-US" level="2" l10n="U" oldref="64">Choose Item</paragraph>
<paragraph role="paragraph" id="par_id3147455" xml-lang="en-US" l10n="U" oldref="65">This dialog is shown when you click an <emph>Input list</emph> field in the document. </paragraph>
<paragraph role="paragraph" id="par_id3149837" xml-lang="en-US" l10n="U" oldref="66"><ahelp hid="SW_LISTBOX_DLG_FLD_DROPDOWN_LB_LISTITEMS">Choose the item that you want to display in the document, then click <emph>OK</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_PUSHBUTTON_DLG_FLD_DROPDOWN_PB_EDIT" id="bm_id3148848" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_FLD_DROPDOWN:PB_EDIT" id="bm_id3148848" localize="false"/>
<paragraph role="heading" id="hd_id3147602" xml-lang="en-US" level="2" l10n="U" oldref="67">Edit</paragraph>
<paragraph role="paragraph" id="par_id3148855" xml-lang="en-US" l10n="U" oldref="68"><ahelp hid="SW_PUSHBUTTON_DLG_FLD_DROPDOWN_PB_EDIT">Displays the <emph>Edit Fields: Functions</emph> dialog, where you can edit the <emph>Input list</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_PUSHBUTTON_DLG_FLD_DROPDOWN_PB_NEXT" id="bm_id3155570" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_FLD_DROPDOWN:PB_NEXT" id="bm_id3155570" localize="false"/>
<paragraph role="heading" id="hd_id3155558" xml-lang="en-US" level="2" l10n="U" oldref="69">Next</paragraph>
<paragraph role="paragraph" id="par_id3148434" xml-lang="en-US" l10n="U" oldref="70"><ahelp hid="SW_PUSHBUTTON_DLG_FLD_DROPDOWN_PB_NEXT">Closes the current <emph>Input list</emph> and displays the next, if available.</ahelp> You see this button when you open the <emph>Choose Item</emph> dialog by Ctrl+Shift+F9.</paragraph>
</body>
diff --git a/helpcontent2/source/text/swriter/01/04090004.xhp b/helpcontent2/source/text/swriter/01/04090004.xhp
index 8ca21a07f4..1528b49f6f 100644
--- a/helpcontent2/source/text/swriter/01/04090004.xhp
+++ b/helpcontent2/source/text/swriter/01/04090004.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textswriter0104090004xml" indexer="include">
<title id="tit" xml-lang="en-US">DocInformation</title>
@@ -77,10 +77,10 @@
</tablerow>
<tablerow>
<tablecell>
-<paragraph role="tablecontent" id="par_id3150700" xml-lang="en-US" l10n="U" oldref="10">Description</paragraph>
+<paragraph role="tablecontent" id="par_id3150700" xml-lang="en-US" l10n="U" oldref="10">Comments</paragraph>
</tablecell>
<tablecell>
-<paragraph role="tablecontent" id="par_id3147490" xml-lang="en-US" l10n="U" oldref="11">Inserts the comment as entered in the <emph>Description </emph>tab of the <emph>File Properties </emph>dialog.</paragraph>
+<paragraph role="tablecontent" id="par_id3147490" xml-lang="en-US" l10n="U" oldref="11">Inserts the comments as entered in the <emph>Description</emph> tab page of the <emph>Properties</emph> dialog.</paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -141,16 +141,16 @@
</tablerow>
</table>
<embed href="text/swriter/01/04090001.xhp#hinweis"/>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DOKINF:LB_DOKINFSELECTION" id="bm_id3154623" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_DOKINF:LB_DOKINFSELECTION" id="bm_id3154623" localize="false"/>
<paragraph role="paragraph" id="par_id0902200804290272" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Lists the available fields for the field type selected in the <emph>Type </emph>list. To insert a field, click the field, and then click <emph>Insert</emph>.</ahelp></paragraph>
<embed href="text/swriter/01/04090001.xhp#auswahl"/>
<paragraph role="note" id="par_id3149956" xml-lang="en-US" l10n="U" oldref="26">For the "Created", "Modified", and "Last printed" field types, you can include the author, date, and time of the corresponding operation.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DOKINF:LB_DOKINFFORMAT" id="bm_id3166051" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_DOKINF:LB_DOKINFFORMAT" id="bm_id3166051" localize="false"/>
<paragraph role="paragraph" id="par_id0902200804290382" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click the format that you want to apply to the selected field, or click "Additional formats" to define a custom format.</ahelp></paragraph>
<embed href="text/swriter/01/04090001.xhp#format"/>
<embed href="text/swriter/01/04090001.xhp#datumuhrzeitformat"/>
<section id="inhaltfix">
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FLD_DOKINF:CB_DOKINFFIXEDCONTENT" id="bm_id3149620" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FLD_DOKINF:CB_DOKINFFIXEDCONTENT" id="bm_id3149620" localize="false"/>
<paragraph role="heading" id="hd_id3149608" xml-lang="en-US" level="2" l10n="U" oldref="28">Fixed content</paragraph>
<paragraph role="paragraph" id="par_id3150767" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SW:CHECKBOX:TP_FLD_DOKINF:CB_DOKINFFIXEDCONTENT">Inserts the field as static content, that is, the field cannot be updated.</ahelp></paragraph>
</section>
diff --git a/helpcontent2/source/text/swriter/01/04090005.xhp b/helpcontent2/source/text/swriter/01/04090005.xhp
index cde29ea569..1c92fb1902 100644
--- a/helpcontent2/source/text/swriter/01/04090005.xhp
+++ b/helpcontent2/source/text/swriter/01/04090005.xhp
@@ -49,7 +49,7 @@
<embed href="text/swriter/00/00000404.xhp#feldvariablen"/>
</section>
<paragraph role="warning" id="par_id3149759" xml-lang="en-US" l10n="U" oldref="3">User-defined fields are only available in the current document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_VAR_LB_VARTYPE" id="bm_id3154692" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_VAR:LB_VARTYPE" id="bm_id3154692" localize="false"/>
<paragraph role="paragraph" id="par_id0903200802243625" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Lists the available field types. To add a field to your document, click a field type, click a field in the <emph>Select </emph>list, and then click <emph>Insert</emph>.</ahelp></paragraph>
<embed href="text/swriter/01/04090001.xhp#feldtyp"/>
<table id="tbl_id3145416">
@@ -137,19 +137,19 @@
</tablerow>
</table>
<embed href="text/swriter/01/04090001.xhp#hinweis"/>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_VAR_LB_VARNUMFORMAT" id="bm_id3148875" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_VAR:LB_VARNUMFORMAT" id="bm_id3148875" localize="false"/>
<paragraph role="paragraph" id="par_id0903200802243892" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click the format that you want to apply to the selected field, or click "Additional formats" to define a custom format.</ahelp></paragraph>
<embed href="text/swriter/01/04090001.xhp#format"/>
<paragraph role="paragraph" id="par_id3148886" xml-lang="en-US" l10n="U" oldref="25">For user-defined fields, click the format that you want to apply in the <emph>Format </emph>list, or click "Additional formats" to define a custom format.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_EDIT_TP_FLD_VAR_ED_VARNAME" id="bm_id3150108" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FLD_VAR:ED_VARNAME" id="bm_id3150108" localize="false"/>
<paragraph role="paragraph" id="par_id0903200802243880" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Type the name of the user-defined field that you want to create.</ahelp></paragraph>
<embed href="text/swriter/01/04090002.xhp#name"/>
-<bookmark xml-lang="en-US" branch="hid/SW_EDIT_TP_FLD_VAR_ED_VARVALUE" id="bm_id3150119" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FLD_VAR:ED_VARVALUE" id="bm_id3150119" localize="false"/>
<paragraph role="paragraph" id="par_id0903200802243951" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the contents that you want to add to a user-defined field.</ahelp></paragraph>
<embed href="text/swriter/01/04090001.xhp#wert"/>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_VAR_LB_VARFORMAT" id="bm_id3155871" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_VAR:LB_VARFORMAT" id="bm_id3155871" localize="false"/>
<paragraph role="paragraph" id="par_id3155860" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SW_LISTBOX_TP_FLD_VAR_LB_VARFORMAT">In the <emph>Format</emph> list, define if the value is inserted as text or a number.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_VAR_LB_VARSELECTION" id="bm_id3150684" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_VAR:LB_VARSELECTION" id="bm_id3150684" localize="false"/>
<paragraph role="heading" id="hd_id3888363" xml-lang="en-US" level="2" l10n="NEW">Selection<comment>on "Document" and "DocInformation" tab page this is called "Select", on the other tab pages "Selection"</comment></paragraph>
<paragraph role="paragraph" id="par_id7453535" xml-lang="en-US" l10n="NEW"><ahelp hid="SW:LISTBOX:TP_FLD_DOK:LB_DOKSELECTION">Lists the available fields for the field type selected in the <emph>Type </emph>list. To insert a field, click the field, and then click <emph>Insert</emph>.</ahelp></paragraph>
<paragraph role="tip" id="par_id3326822" xml-lang="en-US" l10n="NEW">To quickly insert a field from the list, hold down <switchinline select="sys"><caseinline select="MAC">Command
@@ -161,16 +161,16 @@
<embed href="text/swriter/01/04090003.xhp#hinweis"/>
<embed href="text/swriter/01/04090001.xhp#korrektur"/>
<section id="unsichtbar">
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_FLD_VAR_CB_VARINVISIBLE" id="bm_id3156226" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FLD_VAR:CB_VARINVISIBLE" id="bm_id3156226" localize="false"/>
<paragraph role="heading" id="hd_id3149229" xml-lang="en-US" level="2" l10n="U" oldref="29">Invisible</paragraph>
<paragraph role="paragraph" id="par_id3156233" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SW_CHECKBOX_TP_FLD_VAR_CB_VARINVISIBLE">Hides the field contents in the document.</ahelp> The field is inserted as a thin gray mark in the document. This option is only available for the "Set Variable" and "User Field" field types.</paragraph>
</section>
<paragraph role="heading" id="hd_id3146326" xml-lang="en-US" level="2" l10n="U" oldref="39">Chapter numbering</paragraph>
<paragraph role="paragraph" id="par_id3146340" xml-lang="en-US" l10n="U" oldref="40">Sets the options for resetting chapter numbers.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_VAR_LB_VARCHAPTERLEVEL" id="bm_id3149829" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_VAR:LB_VARCHAPTERLEVEL" id="bm_id3149829" localize="false"/>
<paragraph role="heading" id="hd_id3147456" xml-lang="en-US" level="3" l10n="U" oldref="41">Level</paragraph>
<paragraph role="paragraph" id="par_id3149836" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SW_LISTBOX_TP_FLD_VAR_LB_VARCHAPTERLEVEL">Choose the heading or chapter level at which to restart numbering in the document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_EDIT_TP_FLD_VAR_ED_VARSEPARATOR" id="bm_id3147605" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FLD_VAR:ED_VARSEPARATOR" id="bm_id3147605" localize="false"/>
<paragraph role="heading" id="hd_id3147594" xml-lang="en-US" level="3" l10n="U" oldref="43">Separator</paragraph>
<paragraph role="paragraph" id="par_id3148846" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid="SW_EDIT_TP_FLD_VAR_ED_VARSEPARATOR">Type the character that you want to use as a separator between the heading or chapter levels.</ahelp></paragraph>
<section id="uebernehmen">
diff --git a/helpcontent2/source/text/swriter/01/04090006.xhp b/helpcontent2/source/text/swriter/01/04090006.xhp
index 526932fbcd..7271ad7881 100644
--- a/helpcontent2/source/text/swriter/01/04090006.xhp
+++ b/helpcontent2/source/text/swriter/01/04090006.xhp
@@ -46,7 +46,7 @@
<section id="howtoget">
<embed href="text/swriter/00/00000404.xhp#felddatenbank"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DB:LB_DBTYPE" id="bm_id3154566" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_DB:LB_DBTYPE" id="bm_id3154566" localize="false"/>
<paragraph role="paragraph" id="par_id090220080439090" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Lists the available field types. To add a field to your document, click a field type, click a field in the <emph>Select </emph>list, and then click <emph>Insert</emph>.</ahelp></paragraph>
<embed href="text/swriter/01/04090001.xhp#feldtyp"/>
<table id="tbl_id3155894">
@@ -105,27 +105,27 @@
<bookmark xml-lang="en-US" branch="hid/HID_DB_SELECTION_TLB" id="bm_id3145262" localize="false"/>
<paragraph role="heading" id="hd_id3149565" xml-lang="en-US" level="2" l10n="U" oldref="17">Database Selection</paragraph>
<paragraph role="paragraph" id="par_id3145268" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="HID_DB_SELECTION_TLB">Select the database table or the database query that you want the field to refer to.</ahelp> You can include fields from more than one database or query in a document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FLD_DB:ED_DBCONDITION" id="bm_id3150559" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FLD_DB:ED_DBCONDITION" id="bm_id3150559" localize="false"/>
<paragraph role="paragraph" id="par_id0902200804391084" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">For fields linked to a condition, enter the criteria here.</ahelp></paragraph>
<embed href="text/swriter/01/04090003.xhp#bedingung"/>
<paragraph role="paragraph" id="par_id3147739" xml-lang="en-US" l10n="U" oldref="19">If you want, you can assign a condition that must be met before the contents of the "Any Record" and "Next Record" fields are inserted. The default condition is "True", that is, the condition is always true if you do not change the condition text.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FLD_DB:ED_DBSETNUMBER" id="bm_id3149831" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FLD_DB:ED_DBSETNUMBER" id="bm_id3149831" localize="false"/>
<paragraph role="heading" id="hd_id3146336" xml-lang="en-US" level="2" l10n="U" oldref="20">Record number</paragraph>
<paragraph role="paragraph" id="par_id3149836" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SW:EDIT:TP_FLD_DB:ED_DBSETNUMBER">Enter the number of the record that you want to insert when the condition that you specify is met.</ahelp> The record number corresponds to the current selection in the data source view. For example, if you select the last 5 records in a database containing 10 records, the number of the first record will be 1, and not 6.</paragraph>
<paragraph role="note" id="par_id3153305" xml-lang="en-US" l10n="U" oldref="22">If you refer to fields in a different database (or in a different table or query within the same database), $[officename] determines the record number relative to the current selection.</paragraph>
<paragraph role="heading" id="hd_id3156109" xml-lang="en-US" level="2" l10n="U" oldref="23">Format</paragraph>
<paragraph role="paragraph" id="par_id3156122" xml-lang="en-US" l10n="CHG" oldref="24"><ahelp hid=".">Select the format of the field that you want to insert. This option is available for numerical, boolean, date and time fields.</ahelp><comment>see #i64135</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_FLD_DB:RB_DBOWNFORMAT" id="bm_id3150915" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FLD_DB:RB_DBOWNFORMAT" id="bm_id3150915" localize="false"/>
<paragraph role="heading" id="hd_id3150904" xml-lang="en-US" level="3" l10n="U" oldref="25">From database</paragraph>
<paragraph role="paragraph" id="par_id3150922" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SW:RADIOBUTTON:TP_FLD_DB:RB_DBOWNFORMAT">Uses the format defined in the selected database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_TP_FLD_DB_PB_ADDDB" id="bm_id5024262" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_FLD_DB:PB_ADDDB" id="bm_id5024262" localize="false"/>
<paragraph role="heading" id="par_idN1076E" xml-lang="en-US" level="3" l10n="NEW">Browse</paragraph>
<paragraph role="paragraph" id="par_idN10772" xml-lang="en-US" l10n="NEW"><ahelp hid="878711313">Opens a file open dialog where you can select a database file (*.odb). The selected file is added to the Databases Selection list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_FLD_DB:RB_DBFORMAT" id="bm_id3154326" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FLD_DB:RB_DBFORMAT" id="bm_id3154326" localize="false"/>
<paragraph role="heading" id="hd_id3155084" xml-lang="en-US" level="3" l10n="U" oldref="27">User defined</paragraph>
<paragraph role="paragraph" id="par_id3154333" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SW:RADIOBUTTON:TP_FLD_DB:RB_DBFORMAT">Applies the format that you select in the <emph>List of user-defined formats</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DB:LB_DBNUMFORMAT" id="bm_id3150084" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DB:LB_DBFORMAT" id="bm_id3150087" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_DB:LB_DBNUMFORMAT" id="bm_id3150084" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_DB:LB_DBFORMAT" id="bm_id3150087" localize="false"/>
<paragraph role="heading" id="hd_id3146948" xml-lang="en-US" level="3" l10n="U" oldref="29">List of user-defined formats</paragraph>
<paragraph role="paragraph" id="par_id3150093" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SW:LISTBOX:TP_FLD_DB:LB_DBFORMAT">Lists the available user-defined formats.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_PRINT_AS_MERGE" id="bm_id1835383" localize="false"/>
diff --git a/helpcontent2/source/text/swriter/01/04090100.xhp b/helpcontent2/source/text/swriter/01/04090100.xhp
index a04ba0b225..6ca24371e3 100755
--- a/helpcontent2/source/text/swriter/01/04090100.xhp
+++ b/helpcontent2/source/text/swriter/01/04090100.xhp
@@ -44,10 +44,10 @@
<paragraph role="heading" id="hd_id3147515" xml-lang="en-US" level="1" l10n="U" oldref="1">Input Field</paragraph>
<paragraph role="paragraph" id="par_id3146041" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_FLD_INPUT">Inserts a text field that you can open and edit by clicking it in the document.</ahelp> You can use input fields for text, or to assign a new value to a variable.</paragraph>
<paragraph role="paragraph" id="par_id3154470" xml-lang="en-US" l10n="U" oldref="7">To change the content of an Input Field in a document, click the field, and then edit the text in the lower box of the dialog.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:MULTILINEEDIT:DLG_FLD_INPUT:ED_EDIT" id="bm_id3154564" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MultiLineEdit:DLG_FLD_INPUT:ED_EDIT" id="bm_id3154564" localize="false"/>
<paragraph role="heading" id="hd_id3153669" xml-lang="en-US" level="2" l10n="U" oldref="3">Edit</paragraph>
<paragraph role="paragraph" id="par_id3154571" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SW:MULTILINEEDIT:DLG_FLD_INPUT:ED_EDIT">The upper box displays the name that you entered in the <emph>Reference</emph> box of the Input Field on the <emph>Functions </emph>tab of the <emph>Fields</emph> dialog. The lower box displays the contents of the field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_FLD_INPUT:PB_NEXT" id="bm_id3149685" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_FLD_INPUT:PB_NEXT" id="bm_id3149685" localize="false"/>
<paragraph role="heading" id="hd_id3155897" xml-lang="en-US" level="2" l10n="U" oldref="5">Next</paragraph>
<paragraph role="paragraph" id="par_id3149691" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:PUSHBUTTON:DLG_FLD_INPUT:PB_NEXT">Jumps to the next input field in the document.</ahelp> This button is only available when you position the cursor directly before an input field, and then press Shift+Ctrl+F9.</paragraph>
</body>
diff --git a/helpcontent2/source/text/swriter/01/04120100.xhp b/helpcontent2/source/text/swriter/01/04120100.xhp
index 0564065f66..8de4a40978 100644
--- a/helpcontent2/source/text/swriter/01/04120100.xhp
+++ b/helpcontent2/source/text/swriter/01/04120100.xhp
@@ -97,7 +97,7 @@
<bookmark xml-lang="en-US" branch="hid/HID_INSERT_IDX_MRK_NEW" id="bm_id3151095" localize="false"/>
<paragraph role="heading" id="hd_id3151083" xml-lang="en-US" level="2" l10n="U" oldref="28">New user-defined index</paragraph>
<paragraph role="paragraph" id="par_id3150161" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="HID_INSERT_IDX_MRK_NEW">Opens the <emph>Create New User-defined Index</emph> dialog where you can create a custom index.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_NEW_USER_IDX:ED_NAME" id="bm_id3153307" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_NEW_USER_IDX:ED_NAME" id="bm_id3153307" localize="false"/>
<paragraph role="heading" id="hd_id3153296" xml-lang="en-US" level="3" l10n="U" oldref="30">Name</paragraph>
<paragraph role="paragraph" id="par_id3153507" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SW:EDIT:DLG_NEW_USER_IDX:ED_NAME">Enter a name for the new user-defined index. The new index is added to the list of available indexes and tables.</ahelp></paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/helpcontent2/source/text/swriter/01/04120201.xhp b/helpcontent2/source/text/swriter/01/04120201.xhp
index b40759d7e3..7553d5d77b 100755
--- a/helpcontent2/source/text/swriter/01/04120201.xhp
+++ b/helpcontent2/source/text/swriter/01/04120201.xhp
@@ -48,19 +48,19 @@
<embed href="text/swriter/00/00000404.xhp#stichwortverzeichnisverz3"/>
</section>
<paragraph role="heading" id="hd_id3150565" xml-lang="en-US" level="2" l10n="U" oldref="26">Assignment</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_TOX_STYLES:LB_LEVEL" id="bm_id3154642" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TOX_STYLES:LB_LEVEL" id="bm_id3154642" localize="false"/>
<paragraph role="heading" id="hd_id3147171" xml-lang="en-US" level="3" l10n="U" oldref="28">Levels</paragraph>
<paragraph role="paragraph" id="par_id3151180" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SW:LISTBOX:TP_TOX_STYLES:LB_LEVEL">Select the index level that you change the formatting of.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_TOX_STYLES:LB_PARALAY" id="bm_id3150766" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TOX_STYLES:LB_PARALAY" id="bm_id3150766" localize="false"/>
<paragraph role="heading" id="hd_id3147571" xml-lang="en-US" level="3" l10n="U" oldref="30">Paragraph Styles</paragraph>
<paragraph role="paragraph" id="par_id3149290" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SW:LISTBOX:TP_TOX_STYLES:LB_PARALAY">Select the paragraph style that you want to apply to the selected index level, and then click the Assign (<emph>&lt;) </emph>button.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_IMAGEBUTTON_TP_TOX_STYLES_BT_ASSIGN" id="bm_id3147514" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:TP_TOX_STYLES:BT_ASSIGN" id="bm_id3147514" localize="false"/>
<paragraph role="heading" id="hd_id3145418" xml-lang="en-US" level="3" l10n="U" oldref="32">&lt;</paragraph>
<paragraph role="paragraph" id="par_id3154099" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SW_IMAGEBUTTON_TP_TOX_STYLES_BT_ASSIGN">Formats the selected index level with the selected paragraph style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_TOX_STYLES:BT_STD" id="bm_id3153533" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_TOX_STYLES:BT_STD" id="bm_id3153533" localize="false"/>
<paragraph role="heading" id="hd_id3149807" xml-lang="en-US" level="3" l10n="U" oldref="34">Default</paragraph>
<paragraph role="paragraph" id="par_id3153539" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="SW:PUSHBUTTON:TP_TOX_STYLES:BT_STD">Resets the formatting of the selected level to the "Default" paragraph style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_TOX_STYLES:BT_EDIT_STYLE" id="bm_id3153668" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_TOX_STYLES:BT_EDIT_STYLE" id="bm_id3153668" localize="false"/>
<paragraph role="heading" id="hd_id3154474" xml-lang="en-US" level="3" l10n="U" oldref="38">Edit</paragraph>
<paragraph role="paragraph" id="par_id3153675" xml-lang="en-US" l10n="CHG" oldref="39"><ahelp hid="SW:PUSHBUTTON:TP_TOX_STYLES:BT_EDIT_STYLE">Opens the <emph>Paragraph Style</emph> dialog, where you can modify the selected paragraph style.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/swriter/01/04120211.xhp b/helpcontent2/source/text/swriter/01/04120211.xhp
index 550fe37211..d5b377da6c 100755
--- a/helpcontent2/source/text/swriter/01/04120211.xhp
+++ b/helpcontent2/source/text/swriter/01/04120211.xhp
@@ -48,47 +48,47 @@
<section id="typtitel">
<paragraph xml-lang="en-US" id="hd_id3150763" role="heading" level="2" l10n="U" oldref="3">Type and Title</paragraph>
<paragraph xml-lang="en-US" id="par_id3149286" role="paragraph" l10n="U" oldref="4">Specify the type and title of the index.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_TOX_SELECT:LB_TYPE" id="bm_id3145412" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TOX_SELECT:LB_TYPE" id="bm_id3145412" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3151171" role="heading" level="3" l10n="U" oldref="5">Type</paragraph>
<paragraph xml-lang="en-US" id="par_id3145418" role="paragraph" l10n="U" oldref="6"><ahelp hid="SW:LISTBOX:TP_TOX_SELECT:LB_TYPE">Select the type of index that you want to insert.</ahelp> The options available on this tab depend on the index type that you select. If the cursor is in an index when you choose the <emph>Insert - Indexes and Tables - Indexes and Tables</emph>, you can then edit that index.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_TOX_SELECT:ED_TITLE" id="bm_id3149812" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_TOX_SELECT:ED_TITLE" id="bm_id3149812" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3149801" role="heading" level="3" l10n="U" oldref="7">Title</paragraph>
<paragraph xml-lang="en-US" id="par_id3153532" role="paragraph" l10n="U" oldref="8"><ahelp hid="SW:EDIT:TP_TOX_SELECT:ED_TITLE">Enter a title for the selected index.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TOX_SELECT:CB_READONLY" id="bm_id3154477" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_SELECT:CB_READONLY" id="bm_id3154477" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3151317" role="heading" level="3" l10n="U" oldref="9">Protected against manual changes</paragraph>
<paragraph xml-lang="en-US" id="par_id3153665" role="paragraph" l10n="U" oldref="10"><ahelp hid="SW:CHECKBOX:TP_TOX_SELECT:CB_READONLY">Prevents the contents of the index from being changed.</ahelp> Manual changes that you make to an index are lost when the index is refreshed. If you want the cursor to scroll through a protected area, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Formatting Aids</emph>, and then select the <emph>Cursor in protected areas - Enabled </emph>check box.</paragraph>
</section>
<section id="verzfuer">
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_TOX_SELECT:LB_AREA" id="bm_id3155904" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TOX_SELECT:LB_AREA" id="bm_id3155904" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3155893" role="heading" level="2" l10n="U"
oldref="11">Create index for</paragraph>
<paragraph xml-lang="en-US" id="par_id3149688" role="paragraph" l10n="U" oldref="12"><ahelp hid="SW:LISTBOX:TP_TOX_SELECT:LB_AREA">Select whether to create the index for the document or for the current chapter.</ahelp></paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_TOX_SELECT:NF_LEVEL" id="bm_id3155181" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_TOX_SELECT:NF_LEVEL" id="bm_id3155181" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3154199" role="heading" level="3" l10n="U"
oldref="13">Evaluation level</paragraph>
<paragraph xml-lang="en-US" id="par_id3143270" role="paragraph" l10n="U" oldref="14"><ahelp hid="SW:NUMERICFIELD:TP_TOX_SELECT:NF_LEVEL">Enter the number of heading levels to include in the index.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id3149484" role="heading" level="2" l10n="U"
oldref="15">Create from</paragraph>
<paragraph xml-lang="en-US" id="par_id3149096" role="paragraph" l10n="U" oldref="16">Use this area to specify which information to include in an index.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TOX_SELECT:CB_FROMHEADINGS" id="bm_id3149826" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_SELECT:CB_FROMHEADINGS" id="bm_id3149826" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3149815" role="heading" level="3" l10n="U"
oldref="17">Outline</paragraph>
<paragraph xml-lang="en-US" id="par_id3151253" role="paragraph" l10n="U" oldref="18"><ahelp hid="SW:CHECKBOX:TP_TOX_SELECT:CB_FROMHEADINGS">Creates the index using outline levels, that is, paragraphs formatted with one of the predefined heading styles (Heading 1-10) are added to the index.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id1209200804373840" role="paragraph" l10n="NEW">You can also assign the outline levels in the <link href="text/swriter/01/05030800.xhp">Outline &amp; Numbering</link> tab page of the Format - Paragraph dialog.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TOX_SELECT:CB_ADDSTYLES" id="bm_id3152766" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_SELECT:CB_ADDSTYLES" id="bm_id3152766" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3153633" role="heading" level="3" l10n="U"
oldref="21">Additional Styles</paragraph>
<paragraph xml-lang="en-US" id="par_id3152772" role="paragraph" l10n="CHG" oldref="22"><variable id="vorlg"><ahelp hid="SW:CHECKBOX:TP_TOX_SELECT:CB_ADDSTYLES">Includes the paragraph styles that you specify in the <emph>Assign Styles</emph> dialog as index entries. To select the paragraph styles that you want to include in the index, click the <emph>Assign Styles (...</emph>) button to the right of this box.</ahelp>
</variable></paragraph>
<section id="buttonvor">
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_TOX_SELECT:PB_ADDSTYLES" id="bm_id3149180" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_TOX_SELECT:PB_ADDSTYLES" id="bm_id3149180" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3149168" role="heading" level="3" l10n="U"
oldref="23">...</paragraph>
<paragraph xml-lang="en-US" id="par_id3145776" role="paragraph" l10n="CHG" oldref="24"><ahelp hid="SW:PUSHBUTTON:TP_TOX_SELECT:PB_ADDSTYLES">Opens the <emph>Assign Styles</emph> dialog, where you can select the paragraph styles to include in the index.</ahelp></paragraph>
</section>
<section id="verzmark">
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TOX_SELECT:CB_TOXMARKS" id="bm_id3155854" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_SELECT:CB_TOXMARKS" id="bm_id3155854" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3151374" role="heading" level="3" l10n="U"
oldref="25">Index marks</paragraph>
<paragraph xml-lang="en-US" id="par_id3155861" role="paragraph" l10n="U" oldref="26"><ahelp hid="SW:CHECKBOX:TP_TOX_SELECT:CB_TOXMARKS">Includes the index entries that you inserted by choosing <emph>Insert - Indexes and Tables - Entry</emph> in the index.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/swriter/01/04120212.xhp b/helpcontent2/source/text/swriter/01/04120212.xhp
index 701cae89bf..40d2a4133d 100755
--- a/helpcontent2/source/text/swriter/01/04120212.xhp
+++ b/helpcontent2/source/text/swriter/01/04120212.xhp
@@ -53,39 +53,39 @@ DEDR: reviewed</lastedited>
<embed href="text/swriter/01/04120211.xhp#typtitel"/>
<embed href="text/swriter/01/04120211.xhp#verzfuer"/>
<paragraph role="heading" id="hd_id3153247" xml-lang="en-US" level="2" l10n="U" oldref="3">Options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_TOX_SELECT_CB_COLLECTSAME" id="bm_id3146963" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_SELECT:CB_COLLECTSAME" id="bm_id3146963" localize="false"/>
<paragraph role="heading" id="hd_id3154651" xml-lang="en-US" level="3" l10n="U" oldref="5">Combine identical entries</paragraph>
<paragraph role="paragraph" id="par_id3153810" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW_CHECKBOX_TP_TOX_SELECT_CB_COLLECTSAME">Replaces identical index entries with a single entry that lists the page numbers where the entry occurs in the document. For example, the entries "View 10, View 43" are combined as "View 10, 43".</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_TOX_SELECT_CB_USEFF" id="bm_id3151393" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_SELECT:CB_USEFF" id="bm_id3151393" localize="false"/>
<paragraph role="heading" id="hd_id3147403" xml-lang="en-US" level="3" l10n="U" oldref="7">Combine identical entries with p or pp</paragraph>
<paragraph role="paragraph" id="par_id3083451" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW_CHECKBOX_TP_TOX_SELECT_CB_USEFF">Replaces identical index entries, which occur also on the directly following page or pages, with a single entry that lists the first page number and a "p" or "pp". For example, the entries "View 10, View 11, View 12" are combined as "View 10pp", and "View 10, View 11" as "View 10p".</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_TOX_SELECT_CB_USE_DASH" id="bm_id3149353" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_SELECT:CB_USE_DASH" id="bm_id3149353" localize="false"/>
<paragraph role="heading" id="hd_id3157870" xml-lang="en-US" level="3" l10n="U" oldref="9">Combine with -</paragraph>
<paragraph role="paragraph" id="par_id3145825" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW_CHECKBOX_TP_TOX_SELECT_CB_USE_DASH">Replaces identical index entries that occur on consecutive pages with a single entry and the page range where the entry occurs. For example, the entries "View 10, View 11, View 12" are combined as "View 10-12".</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_TOX_SELECT_CB_CASESENSITIVE" id="bm_id3150019" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_SELECT:CB_CASESENSITIVE" id="bm_id3150019" localize="false"/>
<paragraph role="heading" id="hd_id3154502" xml-lang="en-US" level="3" l10n="U" oldref="11">Case sensitive</paragraph>
<paragraph role="paragraph" id="par_id3149880" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SW_CHECKBOX_TP_TOX_SELECT_CB_CASESENSITIVE">Distinguishes between uppercase and lowercase letters in identical index entries. For Asian languages special handling applies.</ahelp> If you want the first occurrence of the entry in the document to determine the case of the entry, select <emph>Combine identical entries</emph>.</paragraph>
<paragraph role="note" id="par_idN10671" xml-lang="en-US" l10n="NEW">To use multi-level collation to Asian languages, select <emph>Case sensitive</emph>. In the multi-level collation, the cases and diacritics of the entries are ignored and only the primitive forms of the entries are compared. If the forms are identical, the diacritics of the forms are compared. If the forms are still identical, the cases of the forms as well as the widths of the characters, and the differences in the Japanese Kana are compared.<comment>UFI: see #112590# and #112507#</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_TOX_SELECT_CB_INITIALCAPS" id="bm_id3148393" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_SELECT:CB_INITIALCAPS" id="bm_id3148393" localize="false"/>
<paragraph role="heading" id="hd_id3150569" xml-lang="en-US" level="3" l10n="U" oldref="13">AutoCapitalize entries</paragraph>
<paragraph role="paragraph" id="par_id3148772" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW_CHECKBOX_TP_TOX_SELECT_CB_INITIALCAPS">Automatically capitalizes the first letter of an index entry.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_TOX_SELECT_CB_KEYASENTRY" id="bm_id3153924" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_SELECT:CB_KEYASENTRY" id="bm_id3153924" localize="false"/>
<paragraph role="heading" id="hd_id3155986" xml-lang="en-US" level="3" l10n="U" oldref="15">Keys as separate entries</paragraph>
<paragraph role="paragraph" id="par_id3147170" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW_CHECKBOX_TP_TOX_SELECT_CB_KEYASENTRY">Inserts index keys as separate index entries.</ahelp> A key is inserted as a top level index entry and the entries that are assigned to the key as indented subentries.</paragraph>
<paragraph role="paragraph" id="par_id3151184" xml-lang="en-US" l10n="U" oldref="17">To define an index key, choose <link href="text/swriter/01/04120100.xhp" name="Insert Index Entry"><emph>Insert Index Entry</emph></link> dialog.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_TOX_SELECT_CB_FROMFILE" id="bm_id3150766" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_SELECT:CB_FROMFILE" id="bm_id3150766" localize="false"/>
<paragraph role="heading" id="hd_id3154646" xml-lang="en-US" level="3" l10n="U" oldref="18">Concordance file</paragraph>
<paragraph role="paragraph" id="par_id3156322" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SW_CHECKBOX_TP_TOX_SELECT_CB_FROMFILE">Automatically marks index entries using a concordance file - a list of words to include in an index.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_MENUBUTTON_TP_TOX_SELECT_MB_AUTOMARK" id="bm_id3153151" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MenuButton:TP_TOX_SELECT:MB_AUTOMARK" id="bm_id3153151" localize="false"/>
<paragraph role="heading" id="hd_id3150258" xml-lang="en-US" level="3" l10n="U" oldref="24">File</paragraph>
<paragraph role="paragraph" id="par_id3149287" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SW_MENUBUTTON_TP_TOX_SELECT_MB_AUTOMARK">Select, create, or edit a concordance file.</ahelp></paragraph>
<section id="sort">
<paragraph role="heading" id="hd_id3152950" xml-lang="en-US" level="2" l10n="U" oldref="32">Sort</paragraph>
<paragraph role="paragraph" id="par_id3149812" xml-lang="en-US" l10n="U" oldref="33">Sets the options for sorting the index entries.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_TOX_SELECT_LB_LANGUAGE" id="bm_id3150359" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TOX_SELECT:LB_LANGUAGE" id="bm_id3150359" localize="false"/>
<paragraph role="heading" id="hd_id3150347" xml-lang="en-US" level="3" l10n="U" oldref="34">Language</paragraph>
<paragraph role="paragraph" id="par_id3154475" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="SW_LISTBOX_TP_TOX_SELECT_LB_LANGUAGE">Select the language rules to use for sorting the index entries.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_TOX_SELECT_LB_SORTALG" id="bm_id3147524" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TOX_SELECT:LB_SORTALG" id="bm_id3147524" localize="false"/>
<paragraph role="heading" id="hd_id3153675" xml-lang="en-US" level="3" l10n="U" oldref="36">Key type</paragraph>
<paragraph role="paragraph" id="par_id3147530" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="SW_LISTBOX_TP_TOX_SELECT_LB_SORTALG">Select numeric when you want to sort numbers by value, such as in 1, 2, 12. Select alphanumeric, when you want to sort the numbers by character code, such as in 1, 12, 2.</ahelp></paragraph>
</section>
diff --git a/helpcontent2/source/text/swriter/01/04120213.xhp b/helpcontent2/source/text/swriter/01/04120213.xhp
index b87f86161d..79574821ee 100755
--- a/helpcontent2/source/text/swriter/01/04120213.xhp
+++ b/helpcontent2/source/text/swriter/01/04120213.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textswriter0104120213xml" indexer="include" status="PUBLISH">
@@ -52,13 +52,13 @@
<section id="erzaus">
<paragraph role="heading" id="hd_id3153534" xml-lang="en-US" level="2" l10n="U" oldref="3">Create from</paragraph>
<paragraph role="paragraph" id="par_id3151315" xml-lang="en-US" l10n="U" oldref="4">Specify the information to be combined to form an index.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_TOX_SELECT:RB_FROMCAPTIONS" id="bm_id3153671" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_TOX_SELECT:RB_FROMCAPTIONS" id="bm_id3153671" localize="false"/>
<paragraph role="heading" id="hd_id3154478" xml-lang="en-US" level="3" l10n="U" oldref="5">Captions</paragraph>
<paragraph role="paragraph" id="par_id3153677" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:RADIOBUTTON:TP_TOX_SELECT:RB_FROMCAPTIONS">Creates index entries from object captions.</ahelp> To add a caption to an object, select the object, and then choose <emph>Insert - Caption</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_TOX_SELECT:LB_CAPTIONSEQUENCE" id="bm_id3155903" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TOX_SELECT:LB_CAPTIONSEQUENCE" id="bm_id3155903" localize="false"/>
<paragraph role="heading" id="hd_id3154576" xml-lang="en-US" level="3" l10n="U" oldref="7">Category</paragraph>
<paragraph role="paragraph" id="par_id3149687" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:LISTBOX:TP_TOX_SELECT:LB_CAPTIONSEQUENCE">Select the caption category that you want to use for the index entries.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_TOX_SELECT:LB_DISPLAYTYPE" id="bm_id3155179" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TOX_SELECT:LB_DISPLAYTYPE" id="bm_id3155179" localize="false"/>
<paragraph role="heading" id="hd_id3154195" xml-lang="en-US" level="3" l10n="U" oldref="9">Display</paragraph>
<paragraph role="paragraph" id="par_id3155186" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:LISTBOX:TP_TOX_SELECT:LB_DISPLAYTYPE">Select the part of the caption that you want to use for index entries.</ahelp> The following table lists the caption options that can be selected, based on the caption text "Illustration 24: The Sun", where "Illustration 24" was automatically generated, and "The Sun" was added by the user.</paragraph>
<table id="tbl_id3149490" name="tbl_id3149490">
@@ -97,8 +97,8 @@
</table>
<paragraph role="paragraph" id="par_id3155915" xml-lang="en-US" l10n="U" oldref="19">If you select "Caption Text", the punctuation and the space at the beginning of the caption does not appear in the index entry.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_TOX_SELECT:RB_FROMOBJECTNAMES" id="bm_id3155857" localize="false"/>
-<paragraph role="heading" id="hd_id3151378" xml-lang="en-US" level="3" l10n="U" oldref="20">Object name</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_TOX_SELECT:RB_FROMOBJECTNAMES" id="bm_id3155857" localize="false"/>
+<paragraph role="heading" id="hd_id3151378" xml-lang="en-US" level="3" l10n="U" oldref="20">Object names</paragraph>
<paragraph role="paragraph" id="par_id3155863" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SW:RADIOBUTTON:TP_TOX_SELECT:RB_FROMOBJECTNAMES">Creates index entries from object names.</ahelp> You can view object names in the Navigator, for example, and change them in the context menu.</paragraph>
</section>
</body>
diff --git a/helpcontent2/source/text/swriter/01/04120215.xhp b/helpcontent2/source/text/swriter/01/04120215.xhp
index 81033190ee..283b15a984 100755
--- a/helpcontent2/source/text/swriter/01/04120215.xhp
+++ b/helpcontent2/source/text/swriter/01/04120215.xhp
@@ -55,19 +55,19 @@
<embed href="text/swriter/01/04120211.xhp#vorlg"/>
<embed href="text/swriter/01/04120211.xhp#buttonvor"/>
<embed href="text/swriter/01/04120211.xhp#verzmark"/>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TOX_SELECT:CB_FROMTABLES" id="bm_id3152962" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_SELECT:CB_FROMTABLES" id="bm_id3152962" localize="false"/>
<paragraph role="heading" id="hd_id3151320" xml-lang="en-US" level="3" l10n="U" oldref="8">Tables</paragraph>
<paragraph role="paragraph" id="par_id3154473" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SW:CHECKBOX:TP_TOX_SELECT:CB_FROMTABLES">Includes tables in the index.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TOX_SELECT:CB_FROMGRAPHICS" id="bm_id3153670" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_SELECT:CB_FROMGRAPHICS" id="bm_id3153670" localize="false"/>
<paragraph role="heading" id="hd_id3154569" xml-lang="en-US" level="3" l10n="U" oldref="10">Graphics</paragraph>
<paragraph role="paragraph" id="par_id3153676" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SW:CHECKBOX:TP_TOX_SELECT:CB_FROMGRAPHICS">Includes graphics in the index.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TOX_SELECT:CB_FROMFRAMES" id="bm_id3154188" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_SELECT:CB_FROMFRAMES" id="bm_id3154188" localize="false"/>
<paragraph role="heading" id="hd_id3149685" xml-lang="en-US" level="3" l10n="U" oldref="12">Text frames</paragraph>
<paragraph role="paragraph" id="par_id3154195" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SW:CHECKBOX:TP_TOX_SELECT:CB_FROMFRAMES">Includes text frames in the index.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TOX_SELECT:CB_FROMOLE" id="bm_id3143276" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_SELECT:CB_FROMOLE" id="bm_id3143276" localize="false"/>
<paragraph role="heading" id="hd_id3155182" xml-lang="en-US" level="3" l10n="U" oldref="14">OLE objects</paragraph>
<paragraph role="paragraph" id="par_id3143282" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SW:CHECKBOX:TP_TOX_SELECT:CB_FROMOLE">Includes OLE objects in the index.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TOX_SELECT:CB_LEVELFROMCHAPTER" id="bm_id3149106" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_SELECT:CB_LEVELFROMCHAPTER" id="bm_id3149106" localize="false"/>
<paragraph role="heading" id="hd_id3149095" xml-lang="en-US" level="3" l10n="U" oldref="16">Use level from source chapter</paragraph>
<paragraph role="paragraph" id="par_id3151250" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SW:CHECKBOX:TP_TOX_SELECT:CB_LEVELFROMCHAPTER">Indents table, graphic, text frame, and OLE object index entries according their place in the chapter heading hierarchy.</ahelp></paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/helpcontent2/source/text/swriter/01/04120217.xhp b/helpcontent2/source/text/swriter/01/04120217.xhp
index 043c739dac..b0853bd77f 100755
--- a/helpcontent2/source/text/swriter/01/04120217.xhp
+++ b/helpcontent2/source/text/swriter/01/04120217.xhp
@@ -49,10 +49,10 @@
</section>
<embed href="text/swriter/01/04120211.xhp#typtitel"/>
<paragraph role="heading" id="hd_id3148773" xml-lang="en-US" level="2" l10n="U" oldref="3">Formatting of the entries</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TOX_SELECT:CB_SEQUENCE" id="bm_id3154640" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_SELECT:CB_SEQUENCE" id="bm_id3154640" localize="false"/>
<paragraph role="heading" id="hd_id3147167" xml-lang="en-US" level="3" l10n="U" oldref="5">Number entries</paragraph>
<paragraph role="paragraph" id="par_id3154647" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:CHECKBOX:TP_TOX_SELECT:CB_SEQUENCE">Automatically numbers the bibliography entries.</ahelp> To set the sorting options for the numbering, click the <link href="text/swriter/01/04120227.xhp" name="Entries">Entries</link> tab.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_TOX_SELECT:LB_BRACKET" id="bm_id3149290" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TOX_SELECT:LB_BRACKET" id="bm_id3149290" localize="false"/>
<paragraph role="heading" id="hd_id3150759" xml-lang="en-US" level="3" l10n="U" oldref="7">Brackets</paragraph>
<paragraph role="paragraph" id="par_id3149295" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:LISTBOX:TP_TOX_SELECT:LB_BRACKET">Select the brackets that you want to enclose bibliography entries.</ahelp></paragraph>
<embed href="text/swriter/01/04120212.xhp#sort"/>
diff --git a/helpcontent2/source/text/swriter/01/04120219.xhp b/helpcontent2/source/text/swriter/01/04120219.xhp
index 1610bab95a..963834669e 100755
--- a/helpcontent2/source/text/swriter/01/04120219.xhp
+++ b/helpcontent2/source/text/swriter/01/04120219.xhp
@@ -48,9 +48,9 @@
<paragraph role="heading" level="2" id="hd_id3145249" l10n="U" xml-lang="en-US" oldref="3">Styles</paragraph>
<paragraph role="paragraph" id="par_id3150566" l10n="U" xml-lang="en-US" oldref="4">The list contains the paragraph styles that you can assign to index levels.</paragraph>
<paragraph xml-lang="en-US" oldref="5" role="paragraph" id="par_id3147176" l10n="U">To create an index entry from a paragraph style, click the style in the<emph> Styles</emph> list, and then click the <emph>&gt;&gt; </emph>button to move the style to the index level that you want.</paragraph>
- <bookmark branch="hid/SW_IMAGEBUTTON_DLG_ADD_IDX_STYLES_PB_LEFT" xml-lang="en-US" id="bm_id3151187"/><paragraph role="heading" level="2" id="hd_id3150762" l10n="U" xml-lang="en-US" oldref="6">&lt;&lt;</paragraph>
+ <bookmark branch="hid/sw:ImageButton:DLG_ADD_IDX_STYLES:PB_LEFT" xml-lang="en-US" id="bm_id3151187"/><paragraph role="heading" level="2" id="hd_id3150762" l10n="U" xml-lang="en-US" oldref="6">&lt;&lt;</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3149289" xml-lang="en-US" oldref="7"><ahelp hid="SW_IMAGEBUTTON_DLG_ADD_IDX_STYLES_PB_LEFT" visibility="visible">Moves the selected paragraph style up one level in the index hierarchy.</ahelp></paragraph>
- <bookmark branch="hid/SW_IMAGEBUTTON_DLG_ADD_IDX_STYLES_PB_RIGHT" xml-lang="en-US" id="bm_id3147506"/><paragraph role="heading" level="2" id="hd_id3151178" l10n="U" xml-lang="en-US" oldref="8">&gt;&gt;</paragraph>
+ <bookmark branch="hid/sw:ImageButton:DLG_ADD_IDX_STYLES:PB_RIGHT" xml-lang="en-US" id="bm_id3147506"/><paragraph role="heading" level="2" id="hd_id3151178" l10n="U" xml-lang="en-US" oldref="8">&gt;&gt;</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3157903" xml-lang="en-US" oldref="9"><ahelp hid="SW_IMAGEBUTTON_DLG_ADD_IDX_STYLES_PB_RIGHT" visibility="visible">Moves the selected paragraph style down one level in the index hierarchy.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/04120221.xhp b/helpcontent2/source/text/swriter/01/04120221.xhp
index 4c9501f7dd..179644cc62 100755
--- a/helpcontent2/source/text/swriter/01/04120221.xhp
+++ b/helpcontent2/source/text/swriter/01/04120221.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -41,7 +41,7 @@
</meta>
<body>
<paragraph role="heading" id="hd_id3145827" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/04120221.xhp" name="Entries (table of contents)">Entries (table of contents)</link></paragraph>
-<paragraph role="paragraph" id="par_id3150017" xml-lang="en-US" l10n="U" oldref="2"><variable id="eintraege">Specify the format of the entries in the table of contents.
+<paragraph role="paragraph" id="par_id3150017" xml-lang="en-US" l10n="U" oldref="2"><variable id="eintraege">Specify the format of the entries in the table of contents.
</variable></paragraph>
<section id="howtoget">
<embed href="text/swriter/00/00000404.xhp#verz31"/>
@@ -71,42 +71,42 @@
</list>
</section>
<section id="chapterno">
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_TOX_ENTRY:PB_ENTRYNO" id="bm_id3152962" localize="false"/><paragraph role="heading" id="hd_id3153675" xml-lang="en-US" level="3" l10n="U" oldref="11">Chapter number (E#)</paragraph>
-<paragraph role="paragraph" id="par_id3154567" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:PUSHBUTTON:TP_TOX_ENTRY:PB_ENTRYNO">Inserts the complete chapter heading, including, if available, the chapter number. To assign chapter numbering to a heading style, choose<emph> Tools - Outline Numbering</emph>.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_TOX_ENTRY:PB_ENTRYNO" id="bm_id3152962" localize="false"/><paragraph role="heading" id="hd_id3153675" xml-lang="en-US" level="3" l10n="U" oldref="11">Chapter number (E#)</paragraph>
+<paragraph role="paragraph" id="par_id3154567" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:PUSHBUTTON:TP_TOX_ENTRY:PB_ENTRYNO">Inserts the chapter number. To assign chapter numbering to a heading style, choose<emph> Tools - Outline Numbering</emph>.</ahelp></paragraph>
</section>
<section id="eintragstext">
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_TOX_ENTRY:PB_ENTRY" id="bm_id3154193" localize="false"/><paragraph role="heading" id="hd_id3149691" xml-lang="en-US" level="3" l10n="U" oldref="13">Entry text (E)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_TOX_ENTRY:PB_ENTRY" id="bm_id3154193" localize="false"/><paragraph role="heading" id="hd_id3149691" xml-lang="en-US" level="3" l10n="U" oldref="13">Entry text (E)</paragraph>
<paragraph role="paragraph" id="par_id3154199" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW:PUSHBUTTON:TP_TOX_ENTRY:PB_ENTRY">Inserts the text of the chapter heading.</ahelp></paragraph>
</section>
<section id="tabulator">
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_TOX_ENTRY:PB_TAB" id="bm_id3149484" localize="false"/><paragraph role="heading" id="hd_id3143276" xml-lang="en-US" level="3" l10n="U" oldref="15">Tab stop (T)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_TOX_ENTRY:PB_TAB" id="bm_id3149484" localize="false"/><paragraph role="heading" id="hd_id3143276" xml-lang="en-US" level="3" l10n="U" oldref="15">Tab stop (T)</paragraph>
<paragraph role="paragraph" id="par_id3149490" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW:PUSHBUTTON:TP_TOX_ENTRY:PB_TAB">Inserts a tab stop. To add leader dots to the tab stop, select a character in the <emph>Fill character box</emph>. To change the position of the tab stop, enter a value in the <emph>Tab stop position </emph>box, or select the <emph>Align right </emph>check box.</ahelp></paragraph>
</section>
<section id="seitennr">
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_TOX_ENTRY:PB_PAGENO" id="bm_id3148974" localize="false"/><paragraph role="heading" id="hd_id3151257" xml-lang="en-US" level="3" l10n="U" oldref="17">Page number (#)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_TOX_ENTRY:PB_PAGENO" id="bm_id3148974" localize="false"/><paragraph role="heading" id="hd_id3151257" xml-lang="en-US" level="3" l10n="U" oldref="17">Page number (#)</paragraph>
<paragraph role="paragraph" id="par_id3148981" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:PUSHBUTTON:TP_TOX_ENTRY:PB_PAGENO">Inserts the page number of the entry.</ahelp></paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_TOX_ENTRY:PB_HYPERLINK" id="bm_id3147224" localize="false"/><paragraph role="heading" id="hd_id3147212" xml-lang="en-US" level="3" l10n="U" oldref="19"> Hyperlink (LS and LE)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_TOX_ENTRY:PB_HYPERLINK" id="bm_id3147224" localize="false"/><paragraph role="heading" id="hd_id3147212" xml-lang="en-US" level="3" l10n="U" oldref="19"> Hyperlink (LS and LE)</paragraph>
<paragraph role="paragraph" id="par_id3153631" xml-lang="en-US" l10n="CHG" oldref="20"><ahelp hid="SW:PUSHBUTTON:TP_TOX_ENTRY:PB_HYPERLINK">Creates a hyperlink for the part of the entry that you enclose by the opening (LS) and the closing (LE) hyperlink tags. On the <emph>Structure </emph>line, click in the empty box in front of the part that you want to create a hyperlink for, and then click this button. Click in the empty box after the part that you want to hyperlink, and then click this button again. All hyperlinks must be unique. Available only for a table of contents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_TOX_ENTRY:PB_ALL_LEVELS" id="bm_id3152778" localize="false"/><paragraph role="heading" id="hd_id3152766" xml-lang="en-US" level="3" l10n="U" oldref="36">All</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_TOX_ENTRY:PB_ALL_LEVELS" id="bm_id3152778" localize="false"/><paragraph role="heading" id="hd_id3152766" xml-lang="en-US" level="3" l10n="U" oldref="36">All</paragraph>
<paragraph role="paragraph" id="par_id3155137" xml-lang="en-US" l10n="CHG" oldref="37"><ahelp hid="SW:PUSHBUTTON:TP_TOX_ENTRY:PB_ALL_LEVELS">Applies the current settings without closing the dialog.</ahelp></paragraph>
<section id="aufbau2">
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_TOX_ENTRY:LB_CHARSTYLE" id="bm_id3156270" localize="false"/><paragraph role="heading" id="hd_id3153355" xml-lang="en-US" level="3" l10n="U" oldref="21">Character Style</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TOX_ENTRY:LB_CHARSTYLE" id="bm_id3156270" localize="false"/><paragraph role="heading" id="hd_id3153355" xml-lang="en-US" level="3" l10n="U" oldref="21">Character Style</paragraph>
<paragraph role="paragraph" id="par_id3156277" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SW:LISTBOX:TP_TOX_ENTRY:LB_CHARSTYLE">Specify the formatting style for the selected part on the <emph>Structure line</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_TOX_ENTRY:PB_EDITSTYLE" id="bm_id3145784" localize="false"/><paragraph role="heading" id="hd_id3145772" xml-lang="en-US" level="3" l10n="U" oldref="23">Edit</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_TOX_ENTRY:PB_EDITSTYLE" id="bm_id3145784" localize="false"/><paragraph role="heading" id="hd_id3145772" xml-lang="en-US" level="3" l10n="U" oldref="23">Edit</paragraph>
<paragraph role="paragraph" id="par_id3151372" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SW:PUSHBUTTON:TP_TOX_ENTRY:PB_EDITSTYLE">Opens a dialog where you can edit the selected character style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:COMBOBOX:TP_TOX_ENTRY:CB_FILLCHAR" id="bm_id3155921" localize="false"/><paragraph role="heading" id="hd_id3155909" xml-lang="en-US" level="3" l10n="U" oldref="25">Fill character</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:TP_TOX_ENTRY:CB_FILLCHAR" id="bm_id3155921" localize="false"/><paragraph role="heading" id="hd_id3155909" xml-lang="en-US" level="3" l10n="U" oldref="25">Fill character</paragraph>
<paragraph role="paragraph" id="par_id3150112" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SW:COMBOBOX:TP_TOX_ENTRY:CB_FILLCHAR">Select the tab leader that you want use.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_TOX_ENTRY:MF_TABPOS" id="bm_id3155871" localize="false"/><paragraph role="heading" id="hd_id3155859" xml-lang="en-US" level="3" l10n="U" oldref="27">Tab stop position</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_TOX_ENTRY:MF_TABPOS" id="bm_id3155871" localize="false"/><paragraph role="heading" id="hd_id3155859" xml-lang="en-US" level="3" l10n="U" oldref="27">Tab stop position</paragraph>
<paragraph role="paragraph" id="par_id3150689" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SW:METRICFIELD:TP_TOX_ENTRY:MF_TABPOS">Enter the distance to leave between the left page margin and the tab stop.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TOX_ENTRY:CB_AUTORIGHT" id="bm_id3147488" localize="false"/><paragraph role="heading" id="hd_id3147415" xml-lang="en-US" level="3" l10n="U" oldref="29">To right margin</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_ENTRY:CB_AUTORIGHT" id="bm_id3147488" localize="false"/><paragraph role="heading" id="hd_id3147415" xml-lang="en-US" level="3" l10n="CHG" oldref="29">Align right</paragraph>
<paragraph role="paragraph" id="par_id3147495" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SW:CHECKBOX:TP_TOX_ENTRY:CB_AUTORIGHT">Aligns the tab stop to the right page margin.</ahelp></paragraph>
</section>
<section id="formatierung">
-<bookmark xml-lang="en-US" branch="hid/sw_ListBox_TP_TOX_ENTRY_LB_ENTRY_NO" id="bm_id9986877" localize="false"/><paragraph role="heading" id="hd_id3145269" xml-lang="en-US" level="3" l10n="U" oldref="31">Format</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TOX_ENTRY:LB_ENTRY_NO" id="bm_id9986877" localize="false"/><paragraph role="heading" id="hd_id3145269" xml-lang="en-US" level="3" l10n="U" oldref="31">Format</paragraph>
<paragraph role="paragraph" id="par_id6499221" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Only visible when you click the E# button in the Structure line. Select to show the chapter number with or without separator.</ahelp></paragraph>
<embed href="text/swriter/01/04120222.xhp#eval"/>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TOX_ENTRY:CB_RELTOSTYLE" id="bm_id3150547" localize="false"/><paragraph role="heading" id="hd_id3149559" xml-lang="en-US" level="3" l10n="U" oldref="33">Tab position relative to Paragraph Style indent</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_ENTRY:CB_RELTOSTYLE" id="bm_id3150547" localize="false"/><paragraph role="heading" id="hd_id3149559" xml-lang="en-US" level="3" l10n="U" oldref="33">Tab position relative to Paragraph Style indent</paragraph>
<paragraph role="paragraph" id="par_id3150554" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SW:CHECKBOX:TP_TOX_ENTRY:CB_RELTOSTYLE">Positions the tab stop relative to the "indent from left" value defined in the paragraph style selected on the <emph>Styles</emph> tab. Otherwise the tab stop is positioned relative to the left text margin.</ahelp></paragraph>
</section>
</body>
diff --git a/helpcontent2/source/text/swriter/01/04120222.xhp b/helpcontent2/source/text/swriter/01/04120222.xhp
index 5c747d48b0..68d4f2a89a 100755
--- a/helpcontent2/source/text/swriter/01/04120222.xhp
+++ b/helpcontent2/source/text/swriter/01/04120222.xhp
@@ -52,23 +52,23 @@
<embed href="text/swriter/01/04120221.xhp#eintragstext"/>
<embed href="text/swriter/01/04120221.xhp#tabulator"/>
<section id="level">
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_TOX_ENTRY:PB_CHAPTERINFO" id="bm_id3154566" localize="false"/><paragraph role="heading" id="hd_id3152957" xml-lang="en-US" level="3" l10n="U" oldref="4">Chapter Info</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_TOX_ENTRY:PB_CHAPTERINFO" id="bm_id3154566" localize="false"/><paragraph role="heading" id="hd_id3152957" xml-lang="en-US" level="3" l10n="U" oldref="4">Chapter Info</paragraph>
<paragraph role="paragraph" id="par_id3154573" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SW:PUSHBUTTON:TP_TOX_ENTRY:PB_CHAPTERINFO">Inserts chapter information, such as the chapter heading and number. Select the information that you want to display in the <emph>Chapter entry </emph>box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_TOX_ENTRY:LB_CHAPTERENTRY" id="bm_id3154196" localize="false"/><paragraph role="heading" id="hd_id3149692" xml-lang="en-US" level="3" l10n="U" oldref="6">Chapter entry</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TOX_ENTRY:LB_CHAPTERENTRY" id="bm_id3154196" localize="false"/><paragraph role="heading" id="hd_id3149692" xml-lang="en-US" level="3" l10n="U" oldref="6">Chapter entry</paragraph>
<paragraph role="paragraph" id="par_id3155174" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SW:LISTBOX:TP_TOX_ENTRY:LB_CHAPTERENTRY">Select the chapter information that you want to include in the index entry.</ahelp></paragraph>
<section id="eval">
-<bookmark xml-lang="en-US" branch="hid/sw_NumericField_TP_TOX_ENTRY_NF_LEVEL_OL" id="bm_id354930" localize="false"/><paragraph role="heading" id="hd_id7605517" xml-lang="en-US" level="3" l10n="NEW">Evaluate up to level</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_TOX_ENTRY:NF_LEVEL_OL" id="bm_id354930" localize="false"/><paragraph role="heading" id="hd_id7605517" xml-lang="en-US" level="3" l10n="NEW">Evaluate up to level</paragraph>
<paragraph role="paragraph" id="par_id6739402" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the maximum hierarchy level down to which objects are shown in the generated index.</ahelp></paragraph>
</section>
</section>
<embed href="text/swriter/01/04120221.xhp#seitennr"/>
<embed href="text/swriter/01/04120221.xhp#aufbau2"/>
<embed href="text/swriter/01/04120221.xhp#formatierung"/>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_TOX_ENTRY:LB_MAIN_ENTRY_STYLE" id="bm_id3149102" localize="false"/><paragraph role="heading" id="hd_id3149493" xml-lang="en-US" level="3" l10n="U" oldref="8">Character Style for main entries</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TOX_ENTRY:LB_MAIN_ENTRY_STYLE" id="bm_id3149102" localize="false"/><paragraph role="heading" id="hd_id3149493" xml-lang="en-US" level="3" l10n="U" oldref="8">Character Style for main entries</paragraph>
<paragraph role="paragraph" id="par_id3149109" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SW:LISTBOX:TP_TOX_ENTRY:LB_MAIN_ENTRY_STYLE">Specify the formatting style for the main entries in the alphabetical index. To convert an index entry into a main entry, click in front of the index field in the document and then choose <emph>Edit - </emph><link href="text/swriter/01/04120100.xhp" name="Index Entry"><emph>Index Entry</emph></link>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TOX_ENTRY:CB_ALPHADELIM" id="bm_id3147094" localize="false"/><paragraph role="heading" id="hd_id3148977" xml-lang="en-US" level="3" l10n="U" oldref="10">Alphabetical delimiter</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_ENTRY:CB_ALPHADELIM" id="bm_id3147094" localize="false"/><paragraph role="heading" id="hd_id3148977" xml-lang="en-US" level="3" l10n="U" oldref="10">Alphabetical delimiter</paragraph>
<paragraph role="paragraph" id="par_id3147100" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SW:CHECKBOX:TP_TOX_ENTRY:CB_ALPHADELIM">Uses the initial letters of the alphabetically arranged index entries as section headings.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TOX_ENTRY:CB_COMMASEPARATED" id="bm_id3149043" localize="false"/><paragraph role="heading" id="hd_id3147226" xml-lang="en-US" level="3" l10n="U" oldref="12">Key separated by commas</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_ENTRY:CB_COMMASEPARATED" id="bm_id3149043" localize="false"/><paragraph role="heading" id="hd_id3147226" xml-lang="en-US" level="3" l10n="U" oldref="12">Key separated by commas</paragraph>
<paragraph role="paragraph" id="par_id3153631" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SW:CHECKBOX:TP_TOX_ENTRY:CB_COMMASEPARATED">Arranges the index entries on the same line, separated by commas.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/04120227.xhp b/helpcontent2/source/text/swriter/01/04120227.xhp
index bbe3961d0a..a320696dc9 100755
--- a/helpcontent2/source/text/swriter/01/04120227.xhp
+++ b/helpcontent2/source/text/swriter/01/04120227.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -41,40 +41,40 @@
</meta>
<body>
<paragraph role="heading" id="hd_id3151388" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/04120227.xhp" name="Entries (bibliography)">Entries (bibliography)</link></paragraph>
-<paragraph role="paragraph" id="par_id3083449" xml-lang="en-US" l10n="U" oldref="2"><variable id="eintraege">Specify the format for bibliography entries.
+<paragraph role="paragraph" id="par_id3083449" xml-lang="en-US" l10n="U" oldref="2"><variable id="eintraege">Specify the format for bibliography entries.
</variable></paragraph>
<section id="howtoget">
<embed href="text/swriter/00/00000404.xhp#verz37"/>
</section>
-<embed href="text/swriter/01/04120221.xhp#ebene"/>
+<paragraph role="heading" id="hd_id31544970" xml-lang="en-US" level="2" l10n="NEW">Type</paragraph>
<paragraph role="paragraph" id="par_id3150017" xml-lang="en-US" l10n="U" oldref="3">The types that are displayed depend on the different literature sources.</paragraph>
<embed href="text/swriter/01/04120221.xhp#aufbau"/>
<embed href="text/swriter/01/04120221.xhp#tabulator"/>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_TOX_ENTRY:LB_AUTHFIELD" id="bm_id3147168" localize="false"/><paragraph role="heading" id="hd_id3150570" xml-lang="en-US" level="3" l10n="U" oldref="4">Type</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TOX_ENTRY:LB_AUTHFIELD" id="bm_id3147168" localize="false"/><paragraph role="heading" id="hd_id3150570" xml-lang="en-US" level="3" l10n="U" oldref="4">Type</paragraph>
<paragraph role="paragraph" id="par_id3147175" xml-lang="en-US" l10n="CHG" oldref="5">Lists the available bibliography entries. <ahelp hid=".">To add an entry to the Structure line, click the entry, click in an empty box on the Structure line, and then click <emph>Insert</emph>.</ahelp> Use the <link href="text/swriter/01/04120229.xhp" name="Define Bibliography Entry">Define Bibliography Entry</link> dialog to add new entries.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_TOX_ENTRY:PB_AUTHINSERT" id="bm_id3151171" localize="false"/><paragraph role="heading" id="hd_id3149287" xml-lang="en-US" level="3" l10n="U" oldref="6">Insert</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_TOX_ENTRY:PB_AUTHINSERT" id="bm_id3151171" localize="false"/><paragraph role="heading" id="hd_id3149287" xml-lang="en-US" level="3" l10n="U" oldref="6">Insert</paragraph>
<paragraph role="paragraph" id="par_id3151178" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SW:PUSHBUTTON:TP_TOX_ENTRY:PB_AUTHINSERT">Adds the reference code for the selected bibliography entry to the Structure line. Select an entry in the list, click in an empty box, and then click this button.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_TOX_ENTRY:PB_AUTHREMOVE" id="bm_id3149800" localize="false"/><paragraph role="heading" id="hd_id3154096" xml-lang="en-US" level="3" l10n="U" oldref="8">Remove</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_TOX_ENTRY:PB_AUTHREMOVE" id="bm_id3149800" localize="false"/><paragraph role="heading" id="hd_id3154096" xml-lang="en-US" level="3" l10n="U" oldref="8">Remove</paragraph>
<paragraph role="paragraph" id="par_id3149807" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SW:PUSHBUTTON:TP_TOX_ENTRY:PB_AUTHREMOVE">Removes the selected reference code from the Structure line.</ahelp></paragraph>
<embed href="text/swriter/01/04120221.xhp#aufbau2"/>
<paragraph role="heading" id="hd_id3154470" xml-lang="en-US" level="2" l10n="U" oldref="10">Sort by</paragraph>
<paragraph role="paragraph" id="par_id3154482" xml-lang="en-US" l10n="U" oldref="11">Specify the sorting options for the bibliography entries.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_TOX_ENTRY:RB_DOCPOS" id="bm_id3153677" localize="false"/><paragraph role="heading" id="hd_id3153665" xml-lang="en-US" level="3" l10n="U" oldref="12">Document position</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_TOX_ENTRY:RB_DOCPOS" id="bm_id3153677" localize="false"/><paragraph role="heading" id="hd_id3153665" xml-lang="en-US" level="3" l10n="U" oldref="12">Document position</paragraph>
<paragraph role="paragraph" id="par_id3151314" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SW:RADIOBUTTON:TP_TOX_ENTRY:RB_DOCPOS">Sorts the bibliography entries according to the position of their references in the document.</ahelp> Select this option if you want to use automatically numbered references.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_TOX_ENTRY:RB_SORTCONTENT" id="bm_id3155902" localize="false"/><paragraph role="heading" id="hd_id3154576" xml-lang="en-US" level="3" l10n="U" oldref="14">Content</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_TOX_ENTRY:RB_SORTCONTENT" id="bm_id3155902" localize="false"/><paragraph role="heading" id="hd_id3154576" xml-lang="en-US" level="3" l10n="U" oldref="14">Content</paragraph>
<paragraph role="paragraph" id="par_id3149687" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SW:RADIOBUTTON:TP_TOX_ENTRY:RB_SORTCONTENT">Sorts the bibliography entries by the Sort keys that you specify, for example, by author or by year of publication.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3155175" xml-lang="en-US" level="2" l10n="U" oldref="16">Sort keys</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_TOX_ENTRY:LB_FIRSTKEY" id="bm_id3143281" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_TOX_ENTRY:LB_SECONDKEY" id="bm_id3149481" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_TOX_ENTRY:LB_THIRDKEY" id="bm_id3149486" localize="false"/><paragraph role="heading" id="hd_id3143270" xml-lang="en-US" level="3" l10n="U" oldref="18">1, 2 or 3</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TOX_ENTRY:LB_FIRSTKEY" id="bm_id3143281" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TOX_ENTRY:LB_SECONDKEY" id="bm_id3149481" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TOX_ENTRY:LB_THIRDKEY" id="bm_id3149486" localize="false"/><paragraph role="heading" id="hd_id3143270" xml-lang="en-US" level="3" l10n="U" oldref="18">1, 2 or 3</paragraph>
<paragraph role="paragraph" id="par_id3149491" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SW:LISTBOX:TP_TOX_ENTRY:LB_THIRDKEY">Select the entry by which to sort the bibliography entries. This option is only available if you select the <emph>Content</emph> radio button in the <emph>Sort by</emph> area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGERADIOBUTTON:TP_TOX_ENTRY:RB_SORTUP1" id="bm_id3149104" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGERADIOBUTTON:TP_TOX_ENTRY:RB_SORTUP2" id="bm_id3149108" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGERADIOBUTTON:TP_TOX_ENTRY:RB_SORTUP3" id="bm_id3147091" localize="false"/><paragraph role="heading" id="hd_id3149826" xml-lang="en-US" level="3" l10n="U" oldref="20">AZ</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageRadioButton:TP_TOX_ENTRY:RB_SORTUP1" id="bm_id3149104" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageRadioButton:TP_TOX_ENTRY:RB_SORTUP2" id="bm_id3149108" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageRadioButton:TP_TOX_ENTRY:RB_SORTUP3" id="bm_id3147091" localize="false"/><paragraph role="heading" id="hd_id3149826" xml-lang="en-US" level="3" l10n="U" oldref="20">AZ</paragraph>
<paragraph role="paragraph" id="par_id3147098" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SW:IMAGERADIOBUTTON:TP_TOX_ENTRY:RB_SORTUP3">Sorts the bibliography entries in ascending alphanumerical order.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGERADIOBUTTON:TP_TOX_ENTRY:RB_SORTDOWN1" id="bm_id3147221" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGERADIOBUTTON:TP_TOX_ENTRY:RB_SORTDOWN2" id="bm_id3147225" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGERADIOBUTTON:TP_TOX_ENTRY:RB_SORTDOWN3" id="bm_id3149035" localize="false"/><paragraph role="heading" id="hd_id3148981" xml-lang="en-US" level="3" l10n="U" oldref="22">ZA</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageRadioButton:TP_TOX_ENTRY:RB_SORTDOWN1" id="bm_id3147221" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageRadioButton:TP_TOX_ENTRY:RB_SORTDOWN2" id="bm_id3147225" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageRadioButton:TP_TOX_ENTRY:RB_SORTDOWN3" id="bm_id3149035" localize="false"/><paragraph role="heading" id="hd_id3148981" xml-lang="en-US" level="3" l10n="U" oldref="22">ZA</paragraph>
<paragraph role="paragraph" id="par_id3149041" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SW:IMAGERADIOBUTTON:TP_TOX_ENTRY:RB_SORTDOWN3">Sorts the bibliography entries in a descending alphanumerical order.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/04150000.xhp b/helpcontent2/source/text/swriter/01/04150000.xhp
index 7c299ddd90..430c027849 100644
--- a/helpcontent2/source/text/swriter/01/04150000.xhp
+++ b/helpcontent2/source/text/swriter/01/04150000.xhp
@@ -64,35 +64,35 @@ dedr: reviewed</lastedited>
</list>
<paragraph role="paragraph" id="par_id3154638" xml-lang="en-US" l10n="CHG" oldref="50">$[officename] can automatically format numbers that you enter in a table cell, for example, dates and times. To activate this feature, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Table</emph> and click the<emph> Number recognition </emph>check box in the <emph>Input in tables</emph> area.</paragraph>
<embed href="text/swriter/guide/calculate_intext2.xhp#calculate_intext2"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_INSERT_TABLE:ED_NAME" id="bm_id3147514" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_INSERT_TABLE:ED_NAME" id="bm_id3147514" localize="false"/>
<paragraph role="heading" id="hd_id3145419" xml-lang="en-US" level="2" l10n="U" oldref="4">Name</paragraph>
<paragraph role="paragraph" id="par_id3154099" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SW:EDIT:DLG_INSERT_TABLE:ED_NAME">Enter a name for the table.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149806" xml-lang="en-US" level="2" l10n="U" oldref="9">Table size</paragraph>
<paragraph role="paragraph" id="par_id3153533" xml-lang="en-US" l10n="U" oldref="10">Specify the number of columns and rows in the new table.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:DLG_INSERT_TABLE:ED_COL" id="bm_id3154569" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_INSERT_TABLE:ED_COL" id="bm_id3154569" localize="false"/>
<paragraph role="heading" id="hd_id3153672" xml-lang="en-US" level="3" l10n="U" oldref="11">Columns</paragraph>
<paragraph role="paragraph" id="par_id3154576" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:NUMERICFIELD:DLG_INSERT_TABLE:ED_COL">Enter the number of columns that you want in the table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:DLG_INSERT_TABLE:ED_ROW" id="bm_id3154470" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_INSERT_TABLE:ED_ROW" id="bm_id3154470" localize="false"/>
<paragraph role="heading" id="hd_id3152954" xml-lang="en-US" level="3" l10n="U" oldref="13">Rows</paragraph>
<paragraph role="paragraph" id="par_id3154477" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW:NUMERICFIELD:DLG_INSERT_TABLE:ED_ROW">Enter the number of rows that you want in the table.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3155903" xml-lang="en-US" level="2" l10n="U" oldref="37">Options</paragraph>
<paragraph role="paragraph" id="par_id3149694" xml-lang="en-US" l10n="U" oldref="41">Set the options for the table.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_INSERT_TABLE:CB_HEADER" id="bm_id3155181" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_INSERT_TABLE:CB_HEADER" id="bm_id3155181" localize="false"/>
<paragraph role="heading" id="hd_id3154198" xml-lang="en-US" level="3" l10n="CHG" oldref="42">Heading</paragraph>
<paragraph role="paragraph" id="par_id3155188" xml-lang="en-US" l10n="CHG" oldref="43"><ahelp hid="SW:CHECKBOX:DLG_INSERT_TABLE:CB_HEADER">Includes a heading row in the table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_INSERT_TABLE:CB_REPEAT_HEADER" id="bm_id3143283" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_INSERT_TABLE:CB_REPEAT_HEADER" id="bm_id3143283" localize="false"/>
<paragraph role="heading" id="hd_id3143270" xml-lang="en-US" level="3" l10n="CHG" oldref="38">Repeat heading</paragraph>
<paragraph role="paragraph" id="par_id3151252" xml-lang="en-US" l10n="CHG" oldref="44"><ahelp hid="SW:CHECKBOX:DLG_INSERT_TABLE:CB_REPEAT_HEADER">Repeats the heading of the table at the top of subsequent page if the table spans more than one page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_NUMERICFIELD_DLG_INSERT_TABLE_NF_REPEAT_HEADER" id="bm_id227973" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_INSERT_TABLE:NF_REPEAT_HEADER" id="bm_id227973" localize="false"/>
<paragraph role="heading" id="par_idN10754" xml-lang="en-US" level="3" l10n="NEW">The first ... rows</paragraph>
<paragraph role="paragraph" id="par_idN10758" xml-lang="en-US" l10n="NEW"><ahelp hid="sw:NumericField:DLG_INSERT_TABLE:NF_REPEAT_HEADER">Select the number of rows that you want to use for the heading.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_INSERT_TABLE:CB_DONT_SPLIT" id="bm_id3149100" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_INSERT_TABLE:CB_DONT_SPLIT" id="bm_id3149100" localize="false"/>
<paragraph role="heading" id="hd_id3149821" xml-lang="en-US" level="3" l10n="U" oldref="39">Do not split the table</paragraph>
<paragraph role="paragraph" id="par_id3149106" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="SW:CHECKBOX:DLG_INSERT_TABLE:CB_DONT_SPLIT">Prevents the table from spanning more than one page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_INSERT_TABLE:CB_BORDER" id="bm_id3147097" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_INSERT_TABLE:CB_BORDER" id="bm_id3147097" localize="false"/>
<paragraph role="heading" id="hd_id3154838" xml-lang="en-US" level="3" l10n="U" oldref="40">Border</paragraph>
<paragraph role="paragraph" id="par_id3148970" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="SW:CHECKBOX:DLG_INSERT_TABLE:CB_BORDER">Adds a border to the table cells.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_INSERT_TABLE:BT_AUTOFORMAT" id="bm_id3147226" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_INSERT_TABLE:BT_AUTOFORMAT" id="bm_id3147226" localize="false"/>
<paragraph role="heading" id="hd_id3147213" xml-lang="en-US" level="2" l10n="U" oldref="35">AutoFormat</paragraph>
<paragraph role="paragraph" id="par_id3149036" xml-lang="en-US" l10n="CHG" oldref="36"><variable id="autoformattext"><ahelp hid="SW:PUSHBUTTON:DLG_INSERT_TABLE:BT_AUTOFORMAT">Opens the <emph>AutoFormat</emph> dialog, where you can select a predefined layout for table.</ahelp>
</variable></paragraph>
diff --git a/helpcontent2/source/text/swriter/01/04180400.xhp b/helpcontent2/source/text/swriter/01/04180400.xhp
index 47649d8b64..68aeb25675 100644
--- a/helpcontent2/source/text/swriter/01/04180400.xhp
+++ b/helpcontent2/source/text/swriter/01/04180400.xhp
@@ -58,12 +58,12 @@
<paragraph role="paragraph" id="par_id3153818" xml-lang="en-US" l10n="U" oldref="8">For example, if you inserting address fields in a form letter from an address database, you can then exchange the database with another address database to insert different addresses.</paragraph>
<paragraph role="heading" id="hd_id3149130" xml-lang="en-US" level="2" l10n="U" oldref="3">Exchanging Databases</paragraph>
<paragraph role="paragraph" id="par_id3154651" xml-lang="en-US" l10n="U" oldref="4">You can only change one database at a time in this dialog.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_MODALDIALOG_DLG_CHANGE_DB" id="bm_id3149048" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ModalDialog:DLG_CHANGE_DB" id="bm_id3149048" localize="false"/>
<paragraph role="heading" id="hd_id3146965" xml-lang="en-US" level="3" l10n="U" oldref="5">Databases in Use</paragraph>
<paragraph role="paragraph" id="par_id3149053" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SW_MODALDIALOG_DLG_CHANGE_DB">Lists the databases that are currently in use.</ahelp> The current document contains at least one data field from each of the databases in the list.</paragraph><comment>UFI: removed double help id</comment>
<paragraph role="heading" id="hd_id3147300" xml-lang="en-US" level="3" l10n="U" oldref="6">Available Databases</paragraph>
<paragraph role="paragraph" id="par_id3150533" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW_MODALDIALOG_DLG_CHANGE_DB">Lists the databases that are registered in <item type="productname">%PRODUCTNAME</item>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_CHANGE_DB_PB_ADDDB" id="bm_id9902035" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_CHANGE_DB:PB_ADDDB" id="bm_id9902035" localize="false"/>
<paragraph role="heading" id="par_idN106DB" xml-lang="en-US" level="2" l10n="NEW">Browse</paragraph>
<paragraph role="paragraph" id="par_idN106DF" xml-lang="en-US" l10n="NEW"><ahelp hid="1419596301">Opens a file open dialog to select a database file (*.odb). The selected file is added to the Available Databases list.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149349" xml-lang="en-US" level="2" l10n="U" oldref="7">Define</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/04200000.xhp b/helpcontent2/source/text/swriter/01/04200000.xhp
index 92005cf76a..49bcde53ed 100644
--- a/helpcontent2/source/text/swriter/01/04200000.xhp
+++ b/helpcontent2/source/text/swriter/01/04200000.xhp
@@ -38,7 +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/sw:ModalDialog:DLG_JAVAEDIT" id="bm_id3083451" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/FN_JAVAEDIT" id="bm_id106266" 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>
@@ -49,30 +49,30 @@
</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/sw:ImageButton:DLG_JAVAEDIT:BTN_PREV" 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/sw:ImageButton:DLG_JAVAEDIT:BTN_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/sw:Edit:DLG_JAVAEDIT:ED_TYPE" 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 &lt;SCRIPT LANGUAGE="JavaScript"&gt;.</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"/>
+<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="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_id3152963" role="paragraph" l10n="U" oldref="15">&lt;SCRIPT LANGUAGE="JavaScript" SRC="url"&gt;</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">&lt;/SCRIPT&gt;</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/sw:PushButton:DLG_JAVAEDIT:PB_URL" 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"/>
+<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="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>
diff --git a/helpcontent2/source/text/swriter/01/05030200.xhp b/helpcontent2/source/text/swriter/01/05030200.xhp
index 61d107ce0f..4580af1ab6 100755
--- a/helpcontent2/source/text/swriter/01/05030200.xhp
+++ b/helpcontent2/source/text/swriter/01/05030200.xhp
@@ -55,52 +55,52 @@
</section>
<paragraph role="heading" id="hd_id3149882" xml-lang="en-US" level="2" l10n="U" oldref="3">Hyphenation</paragraph>
<paragraph role="paragraph" id="par_id3150564" xml-lang="en-US" l10n="U" oldref="4">Specify the <link href="text/swriter/guide/using_hyphen.xhp" name="hyphenation">hyphenation</link> options for text documents.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_HYPHEN" id="bm_id3147171" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_HYPHEN" id="bm_id3147171" localize="false"/>
<paragraph role="heading" id="hd_id3153920" xml-lang="en-US" level="3" l10n="U" oldref="5">Automatically</paragraph>
<paragraph role="paragraph" id="par_id3154640" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_HYPHEN">Automatically inserts hyphens where they are needed in a paragraph.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENBEFORE" id="bm_id3149286" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENBEFORE" id="bm_id3149286" localize="false"/>
<paragraph role="heading" id="hd_id3150766" xml-lang="en-US" level="3" l10n="U" oldref="7">Characters at line end</paragraph>
<paragraph role="paragraph" id="par_id3149291" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENBEFORE">Enter the minimum number of characters to leave at the end of the line before a hyphen is inserted.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENAFTER" id="bm_id3147508" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENAFTER" id="bm_id3147508" localize="false"/>
<paragraph role="heading" id="hd_id3145413" xml-lang="en-US" level="3" l10n="U" oldref="9">Characters at line begin</paragraph>
<paragraph role="paragraph" id="par_id3147515" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENAFTER">Enter the minimum number of characters that must appear at the beginning of the line after the hyphen.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_MAXHYPH" id="bm_id3153530" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_MAXHYPH" id="bm_id3153530" localize="false"/>
<paragraph role="heading" id="hd_id3149804" xml-lang="en-US" level="3" l10n="U" oldref="11">Maximum no. of consecutive hyphens</paragraph>
<paragraph role="paragraph" id="par_id3153536" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_MAXHYPH">Enter the maximum number of consecutive lines that can be hyphenated.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153665" xml-lang="en-US" level="2" l10n="U" oldref="43">Breaks</paragraph>
<paragraph role="paragraph" id="par_id3154470" xml-lang="en-US" l10n="U" oldref="44">Specify the page or column <link href="text/swriter/guide/page_break.xhp" name="break">break</link> options.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGEBREAK" id="bm_id3154567" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGEBREAK" id="bm_id3154567" localize="false"/>
<paragraph role="heading" id="hd_id3152957" xml-lang="en-US" level="3" l10n="CHG" oldref="15">Insert<comment>UFI: #i30777#</comment></paragraph>
<paragraph role="paragraph" id="par_id3154574" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGEBREAK">Select this check box, and then select the break type that you want to use.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_EXT_PARAGRAPH_LB_BREAKTYPE" id="bm_id3154189" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_BREAKTYPE" id="bm_id3154189" localize="false"/>
<paragraph role="heading" id="hd_id3149687" xml-lang="en-US" level="3" l10n="U" oldref="39">Type</paragraph>
<paragraph role="paragraph" id="par_id3154195" xml-lang="en-US" l10n="U" oldref="41"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_EXT_PARAGRAPH_LB_BREAKTYPE">Select the break type that you want to insert.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_EXT_PARAGRAPH_LB_BREAKPOSITION" id="bm_id3155180" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_BREAKPOSITION" id="bm_id3155180" localize="false"/>
<paragraph role="heading" id="hd_id3145766" xml-lang="en-US" level="3" l10n="U" oldref="40">Position</paragraph>
<paragraph role="paragraph" id="par_id3155187" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_EXT_PARAGRAPH_LB_BREAKPOSITION">Select where you want to insert the break.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGECOLL" id="bm_id3149494" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGECOLL" id="bm_id3149494" localize="false"/>
<paragraph role="heading" id="hd_id3149482" xml-lang="en-US" level="3" l10n="U" oldref="25">With Page Style</paragraph>
<paragraph role="paragraph" id="par_id3143275" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGECOLL">Select this check box, and then select the page style that you want to use for the first page after the break.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_EXT_PARAGRAPH:LB_PAGECOLL" id="bm_id3154831" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_PAGECOLL" id="bm_id3154831" localize="false"/>
<paragraph role="heading" id="hd_id3149104" xml-lang="en-US" level="3" l10n="U" oldref="27">Page Style</paragraph>
<paragraph role="paragraph" id="par_id3154837" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_EXT_PARAGRAPH:LB_PAGECOLL">Select the formatting style to use for the first page after the break.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_PAGENUM" id="bm_id3151257" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_PAGENUM" id="bm_id3151257" localize="false"/>
<paragraph role="heading" id="hd_id3149827" xml-lang="en-US" level="3" l10n="U" oldref="37">Page number</paragraph>
<paragraph role="paragraph" id="par_id3147089" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_PAGENUM">Enter the page number that you want to appear on the first page after the break. If you want to use the current page numbering, select "0".</ahelp></paragraph>
<paragraph role="heading" id="hd_id3148978" xml-lang="en-US" level="2" l10n="U" oldref="13">Options</paragraph>
<paragraph role="paragraph" id="par_id3147219" xml-lang="en-US" l10n="U" oldref="14">Specify the text flow options for paragraphs that appear before and after a page break.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_KEEPTOGETHER" id="bm_id3149033" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_KEEPTOGETHER" id="bm_id3149033" localize="false"/>
<paragraph role="heading" id="hd_id3153635" xml-lang="en-US" level="3" l10n="U" oldref="29">Do not split paragraph</paragraph>
<paragraph role="paragraph" id="par_id3149040" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_KEEPTOGETHER">Shifts the entire paragraph to the next page or column after a break is inserted.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:CB_KEEPTOGETHER" id="bm_id3152772" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:CB_KEEPTOGETHER" id="bm_id3152772" localize="false"/>
<paragraph role="heading" id="hd_id3147585" xml-lang="en-US" level="3" l10n="U" oldref="31">Keep with next paragraph</paragraph>
<paragraph role="paragraph" id="par_id3152779" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:CB_KEEPTOGETHER">Keeps the current paragraph and the following paragraph together when a break or column break is inserted.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_ORPHANS" id="bm_id3153356" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_ORPHANS" id="bm_id3153361" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_ORPHANS" id="bm_id3153356" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_ORPHANS" id="bm_id3153361" localize="false"/>
<paragraph role="heading" id="hd_id3153345" xml-lang="en-US" level="3" l10n="U" oldref="33">Orphan control</paragraph>
<paragraph role="paragraph" id="par_id3156279" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_ORPHANS">Specifies the minimum number of lines in a paragraph before a page break. Select this check box, and then enter a number in the <emph>Lines </emph>box.</ahelp> If the number of lines at the end of the page is less than the amount specified in the <emph>Lines </emph>box, the paragraph is shifted to the next page.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_WIDOWS" id="bm_id3145780" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_WIDOWS" id="bm_id3145784" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_WIDOWS" id="bm_id3145780" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_WIDOWS" id="bm_id3145784" localize="false"/>
<paragraph role="heading" id="hd_id3149180" xml-lang="en-US" level="3" l10n="U" oldref="35">Widow control</paragraph>
<paragraph role="paragraph" id="par_id3155918" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_WIDOWS">Specifies the minimum number of lines in a paragraph in the first page after the break. Select this check box, and then enter a number in the <emph>Lines </emph>box.</ahelp> If the number of lines at the top of the page is less than the amount specified in the <emph>Lines </emph>box, the position of the break is adjusted.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/helpcontent2/source/text/swriter/01/05030400.xhp b/helpcontent2/source/text/swriter/01/05030400.xhp
index fe38b35c5f..d159127f85 100755
--- a/helpcontent2/source/text/swriter/01/05030400.xhp
+++ b/helpcontent2/source/text/swriter/01/05030400.xhp
@@ -55,26 +55,26 @@
<embed href="text/swriter/00/00000405.xhp#initialen"/>
</section>
<paragraph role="heading" id="hd_id3151388" xml-lang="en-US" level="2" l10n="U" oldref="3">Settings</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_DROPCAPS_CB_SWITCH" id="bm_id3146322" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_DROPCAPS:CB_SWITCH" id="bm_id3146322" localize="false"/>
<paragraph role="heading" id="hd_id3147295" xml-lang="en-US" level="3" l10n="U" oldref="5">Show Drop Caps</paragraph>
<paragraph role="paragraph" id="par_id3150536" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW_CHECKBOX_TP_DROPCAPS_CB_SWITCH">Applies the drop cap settings to the selected paragraph.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_DROPCAPS_CB_WORD" id="bm_id3145824" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_DROPCAPS:CB_WORD" id="bm_id3145824" localize="false"/>
<paragraph role="heading" id="hd_id3155626" xml-lang="en-US" level="3" l10n="U" oldref="19">Whole word</paragraph>
<paragraph role="paragraph" id="par_id3154554" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW_CHECKBOX_TP_DROPCAPS_CB_WORD">Displays the first letter of the first word in the paragraph as a drop cap, and the remaining letters of the word as large type.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_NUMERICFIELD_TP_DROPCAPS_FLD_DROPCAPS" id="bm_id3150020" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_DROPCAPS:FLD_DROPCAPS" id="bm_id3150020" localize="false"/>
<paragraph role="heading" id="hd_id3154505" xml-lang="en-US" level="3" l10n="U" oldref="7">Number of characters</paragraph>
<paragraph role="paragraph" id="par_id3149881" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW_NUMERICFIELD_TP_DROPCAPS_FLD_DROPCAPS">Enter the number of characters to convert to drop caps. </ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_NUMERICFIELD_TP_DROPCAPS_FLD_LINES" id="bm_id3148775" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_DROPCAPS:FLD_LINES" id="bm_id3148775" localize="false"/>
<paragraph role="heading" id="hd_id3150932" xml-lang="en-US" level="3" l10n="U" oldref="9">Lines</paragraph>
<paragraph role="paragraph" id="par_id3148391" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SW_NUMERICFIELD_TP_DROPCAPS_FLD_LINES">Enter the number of lines that you want the drop cap to extend downward from the first line of the paragraph. Shorter paragraphs will not get drop caps.</ahelp> The selection is limited to 2-9 lines.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_METRICFIELD_TP_DROPCAPS_FLD_DISTANCE" id="bm_id3153920" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_DROPCAPS:FLD_DISTANCE" id="bm_id3153920" localize="false"/>
<paragraph role="heading" id="hd_id3149030" xml-lang="en-US" level="3" l10n="U" oldref="11">Distance from text</paragraph>
<paragraph role="paragraph" id="par_id3153926" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW_METRICFIELD_TP_DROPCAPS_FLD_DISTANCE">Enter the amount of space to leave between the drop caps and the rest of the text in the paragraph.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153723" xml-lang="en-US" level="2" l10n="U" oldref="13">Contents</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_EDIT_TP_DROPCAPS_EDT_TEXT" id="bm_id3147564" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_DROPCAPS:EDT_TEXT" id="bm_id3147564" localize="false"/>
<paragraph role="heading" id="hd_id3154638" xml-lang="en-US" level="3" l10n="U" oldref="15">Text</paragraph>
<paragraph role="paragraph" id="par_id3147569" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW_EDIT_TP_DROPCAPS_EDT_TEXT">Enter the text that you want to display as drop caps instead of the first letters of the paragraph.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_DROPCAPS_BOX_TEMPLATE" id="bm_id3156321" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_DROPCAPS:BOX_TEMPLATE" id="bm_id3156321" localize="false"/>
<paragraph role="heading" id="hd_id3150763" xml-lang="en-US" level="3" l10n="U" oldref="17">Character Style</paragraph>
<paragraph role="paragraph" id="par_id3151181" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW_LISTBOX_TP_DROPCAPS_BOX_TEMPLATE">Select the formatting style that you want to apply to the drop caps.</ahelp> To use the formatting style of the current paragraph, select [None].</paragraph>
<embed href="text/shared/00/00000001.xhp#vorschau"/>
diff --git a/helpcontent2/source/text/swriter/01/05030800.xhp b/helpcontent2/source/text/swriter/01/05030800.xhp
index e4790b2db9..1a51508da2 100755
--- a/helpcontent2/source/text/swriter/01/05030800.xhp
+++ b/helpcontent2/source/text/swriter/01/05030800.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textswriter0105030800xml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Outline &amp; Numbering</title>
@@ -55,39 +55,40 @@
<paragraph xml-lang="en-US" id="par_id3154470" role="listitem" l10n="CHG" oldref="26">To change the numbering options for selected paragraphs, choose <emph>Format -</emph><link href="text/shared/01/05030000.xhp" name="Paragraph"><emph>Paragraph</emph></link>, and then click the<emph> Outline &amp; Numbering</emph> tab.</paragraph>
</listitem>
</list>
-<bookmark xml-lang="en-US" branch="hid/878857741" id="bm_id1209200804144764" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id1209200804371034" role="heading" level="1" l10n="NEW">Outline level</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_NUMPARA_LB_OUTLINE_LEVEL" id="bm_id1209200804144764" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id1209200804371034" role="heading" level="2" l10n="NEW">Outline level</paragraph>
<paragraph xml-lang="en-US" id="par_id1209200804371097" role="paragraph" l10n="NEW"><ahelp hid=".">Assigns an outline level from 1 to 10 to the selected paragraphs or Paragraph Style.</ahelp> Select <emph>Body text</emph> to reset the outline level.</paragraph><comment>removed two old paras</comment>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_NUMPARA:LB_NUMBER_STYLE" id="bm_id3154200" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3154188" role="heading" level="1" l10n="CHG"
+ <paragraph xml-lang="en-US" id="hd_id3143283" role="heading" level="2" l10n="U" oldref="5">Numbering</paragraph>
+ <bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_NUMPARA:LB_NUMBER_STYLE" id="bm_id3154200" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154188" role="heading" level="2" l10n="CHG"
oldref="3">Numbering Style</paragraph>
<paragraph xml-lang="en-US" id="par_id3155178" role="paragraph" l10n="U" oldref="4"><ahelp hid="SW:LISTBOX:TP_NUMPARA:LB_NUMBER_STYLE">Select the <link href="text/swriter/01/05130004.xhp" name="Numbering Style">Numbering Style</link> that you want to apply to the paragraph.</ahelp> These styles are also listed in the <link href="text/swriter/01/05140000.xhp" name="Styles and Formatting">Styles and Formatting</link> window if you click the <emph>Numbering Style</emph> icon.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3143283" role="heading" level="1" l10n="U" oldref="5">Numbering</paragraph>
+
<paragraph xml-lang="en-US" id="par_id3149106" role="paragraph" l10n="U" oldref="7">This section only appears when you edit the properties of the current paragraph by choosing <emph>Format - Paragraph</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:TRISTATEBOX:TP_NUMPARA:CB_NEW_START" id="bm_id3151262" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3151250" role="heading" level="1" l10n="U" oldref="8">Restart at this paragraph</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:TriStateBox:TP_NUMPARA:CB_NEW_START" id="bm_id3151262" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151250" role="heading" level="2" l10n="U" oldref="8">Restart at this paragraph</paragraph>
<paragraph xml-lang="en-US" id="par_id3154831" role="paragraph" l10n="U" oldref="9"><ahelp hid="SW:TRISTATEBOX:TP_NUMPARA:CB_NEW_START">Restarts the numbering at the current paragraph.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_TRISTATEBOX_TP_NUMPARA_CB_NUMBER_NEW_START" id="bm_id3148973" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3147096" role="heading" level="1" l10n="U"
+<bookmark xml-lang="en-US" branch="hid/sw:TriStateBox:TP_NUMPARA:CB_NUMBER_NEW_START" id="bm_id3148973" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147096" role="heading" level="2" l10n="U"
oldref="24">Start with</paragraph>
<paragraph xml-lang="en-US" id="par_id3148979" role="paragraph" l10n="U" oldref="25"><ahelp hid="SW_TRISTATEBOX_TP_NUMPARA_CB_NUMBER_NEW_START">Select this check box, and then enter the number that you want to assign to the paragraph.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_NUMPARA:NF_NEW_START" id="bm_id3149043" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3147226" role="heading" level="1" l10n="U"
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_NUMPARA:NF_NEW_START" id="bm_id3149043" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147226" role="heading" level="2" l10n="U"
oldref="10">"Start with" spin button</paragraph>
<paragraph xml-lang="en-US" id="par_id3153632" role="paragraph" l10n="U" oldref="11"><ahelp hid="SW:NUMERICFIELD:TP_NUMPARA:NF_NEW_START">Enter the number that you want to assign to the paragraph.</ahelp> The following paragraphs are numbered consecutively from the number that you enter here.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3147581" role="heading" level="1" l10n="U"
+ <paragraph xml-lang="en-US" id="hd_id3147581" role="heading" level="2" l10n="U"
oldref="15">Line numbering</paragraph>
<paragraph xml-lang="en-US" id="par_id3152771" role="paragraph" l10n="U" oldref="16">Specify the <link href="text/swriter/01/06180000.xhp" name="Line numbering">Line numbering</link> options. To add line numbers to your document, choose <emph>Tools - Line Numbering</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:TRISTATEBOX:TP_NUMPARA:CB_COUNT_PARA" id="bm_id3153357" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3153345" role="heading" level="1" l10n="U"
+<bookmark xml-lang="en-US" branch="hid/sw:TriStateBox:TP_NUMPARA:CB_COUNT_PARA" id="bm_id3153357" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153345" role="heading" level="2" l10n="U"
oldref="17">Include this paragraph in line numbering</paragraph>
<paragraph xml-lang="en-US" id="par_id3156267" role="paragraph" l10n="U" oldref="18"><ahelp hid="SW:TRISTATEBOX:TP_NUMPARA:CB_COUNT_PARA">Includes the current paragraph in the line numbering.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:TRISTATEBOX:TP_NUMPARA:CB_RESTART_PARACOUNT" id="bm_id3151038" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3151026" role="heading" level="1" l10n="U"
+<bookmark xml-lang="en-US" branch="hid/sw:TriStateBox:TP_NUMPARA:CB_RESTART_PARACOUNT" id="bm_id3151038" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151026" role="heading" level="2" l10n="U"
oldref="19">Restart at this paragraph</paragraph>
<paragraph xml-lang="en-US" id="par_id3149168" role="paragraph" l10n="U" oldref="20"><ahelp hid="SW:TRISTATEBOX:TP_NUMPARA:CB_RESTART_PARACOUNT">Restarts the line numbering at the current paragraph, or at the number that you enter.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_NUMPARA:NF_RESTART_PARA" id="bm_id3155906" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3145775" role="heading" level="1" l10n="U"
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_NUMPARA:NF_RESTART_PARA" id="bm_id3155906" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145775" role="heading" level="2" l10n="U"
oldref="21">Start with</paragraph>
<paragraph xml-lang="en-US" id="par_id3149355" role="paragraph" l10n="U" oldref="22"><ahelp hid="SW:NUMERICFIELD:TP_NUMPARA:NF_RESTART_PARA">Enter the number at which to restart the line numbering</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/swriter/01/05040500.xhp b/helpcontent2/source/text/swriter/01/05040500.xhp
index 25135cdec3..04c7d95392 100644
--- a/helpcontent2/source/text/swriter/01/05040500.xhp
+++ b/helpcontent2/source/text/swriter/01/05040500.xhp
@@ -54,14 +54,14 @@
</section>
<paragraph xml-lang="en-US" id="hd_id3155625" role="heading" level="2" l10n="U" oldref="3">Default settings</paragraph>
<paragraph xml-lang="en-US" id="par_id3149352" role="paragraph" l10n="U" oldref="4">You can select from predefined column layouts, or create your own. When you apply a layout to a page style, all pages that use the style are updated. Similarly, when you apply a column layout to a frame style, all frames that use that style are updated. You can also change the column layout for a single frame.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_NUMERICFIELD_TP_COLUMN_ED_NUMBER" id="bm_id3154502" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_COLUMN:ED_NUMBER" id="bm_id3154502" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_COLUMN_VALUESET" id="bm_id1212200810184474" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3154562" role="heading" level="3" l10n="U" oldref="5">Columns</paragraph>
<paragraph xml-lang="en-US" id="par_id3154508" role="paragraph" l10n="U" oldref="6"><ahelp hid="SW_NUMERICFIELD_TP_COLUMN_ED_NUMBER">Enter the number of columns that you want in the page, frame, or section.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id3149884" role="paragraph" l10n="U" oldref="47">You can also select one of the predefined column layouts.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3150933" role="heading" level="3" l10n="U"
oldref="45">Selection fields</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_COLUMN_CB_BALANCECOLS" id="bm_id3150568" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_COLUMN:CB_BALANCECOLS" id="bm_id3150568" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3148386" role="heading" level="3" l10n="CHG"
oldref="52">Evenly distribute contents to all columns</paragraph>
<paragraph xml-lang="en-US" id="par_id3149024" role="paragraph" l10n="CHG" oldref="53"><ahelp hid="." visibility="hidden">Distributes the text in multi-column sections. The text flows into all columns to the same height. The height of the section adjusts automatically.</ahelp>Evenly distributes the text in <link href="text/swriter/01/04020000.xhp" name="multi-column sections">multi-column sections</link>.</paragraph>
@@ -71,7 +71,7 @@
<paragraph xml-lang="en-US" id="hd_id3147562" role="heading" level="3" l10n="U"
oldref="21">(Column number)</paragraph>
<paragraph xml-lang="en-US" id="par_id3145206" role="paragraph" l10n="U" oldref="22">Displays the column number, as well as width and distance to the adjacent columns.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_IMAGEBUTTON_TP_COLUMN_BTN_DOWN" id="bm_id3151189" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:TP_COLUMN:BTN_DOWN" id="bm_id3151189" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3156324" role="heading" level="3" l10n="U"
oldref="23">Left Arrow</paragraph>
<paragraph xml-lang="en-US" id="par_id3150761" role="paragraph" l10n="U" oldref="24"><ahelp hid="SW_IMAGEBUTTON_TP_COLUMN_BTN_DOWN">Moves the column display one column to the left.</ahelp></paragraph>
@@ -88,7 +88,7 @@
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SW_IMAGEBUTTON_TP_COLUMN_BTN_UP" id="bm_id3147515" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:TP_COLUMN:BTN_UP" id="bm_id3147515" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3145421" role="heading" level="3" l10n="U"
oldref="25">Right Arrow</paragraph>
<paragraph xml-lang="en-US" id="par_id3153576" role="paragraph" l10n="U" oldref="26"><ahelp hid="SW_IMAGEBUTTON_TP_COLUMN_BTN_UP">Moves the column display one column to the right.</ahelp></paragraph>
@@ -105,17 +105,17 @@
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SW_METRICFIELD_TP_COLUMN_ED_1" id="bm_id3154481" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_METRICFIELD_TP_COLUMN_ED_2" id="bm_id3152953" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_METRICFIELD_TP_COLUMN_ED_3" id="bm_id3152956" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_COLUMN:ED_1" id="bm_id3154481" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_COLUMN:ED_2" id="bm_id3152953" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_COLUMN:ED_3" id="bm_id3152956" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3154470" role="heading" level="3" l10n="U"
oldref="42">Width</paragraph>
<paragraph xml-lang="en-US" id="par_id3152963" role="paragraph" l10n="U" oldref="43"><ahelp hid="SW_METRICFIELD_TP_COLUMN_ED_3">Enter the width of the column.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_METRICFIELD_TP_COLUMN_ED_DIST1" id="bm_id3151319" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_METRICFIELD_TP_COLUMN_ED_DIST2" id="bm_id3153665" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_COLUMN:ED_DIST1" id="bm_id3151319" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_COLUMN:ED_DIST2" id="bm_id3153665" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3151308" role="heading" level="3" l10n="U" oldref="7">Spacing</paragraph>
<paragraph xml-lang="en-US" id="par_id3153672" role="paragraph" l10n="U" oldref="8"><ahelp hid="SW_METRICFIELD_TP_COLUMN_ED_DIST2">Enter the amount of space that you want to leave between the columns.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_COLUMN_CB_AUTO_WIDTH" id="bm_id3154573" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_COLUMN:CB_AUTO_WIDTH" id="bm_id3154573" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3147530" role="heading" level="3" l10n="CHG"
oldref="9">AutoWidth</paragraph>
<paragraph xml-lang="en-US" id="par_id3150986" role="paragraph" l10n="U" oldref="10"><ahelp hid="SW_CHECKBOX_TP_COLUMN_CB_AUTO_WIDTH">Creates columns of equal width.</ahelp></paragraph>
@@ -124,19 +124,19 @@
<paragraph xml-lang="en-US" id="hd_id3149685" role="heading" level="2" l10n="U"
oldref="11">Separator line</paragraph>
<paragraph xml-lang="en-US" id="par_id3154188" role="paragraph" l10n="U" oldref="12">This area is only available if your layout contains more than one column.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_COLUMN_LB_STYLE" id="bm_id3155786" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_COLUMN:LB_STYLE" id="bm_id3155786" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3155775" role="heading" level="3" l10n="U"
oldref="13">Line</paragraph>
<paragraph xml-lang="en-US" id="par_id3159190" role="paragraph" l10n="U" oldref="14"><ahelp hid="SW_LISTBOX_TP_COLUMN_LB_STYLE">Select the formatting style for the column separator line. If you do not want a separator line, choose "None".</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_METRICFIELD_TP_COLUMN_ED_HEIGHT" id="bm_id3149303" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_COLUMN:ED_HEIGHT" id="bm_id3149303" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3155184" role="heading" level="3" l10n="U"
oldref="15">Height</paragraph>
<paragraph xml-lang="en-US" id="par_id3149309" role="paragraph" l10n="U" oldref="16"><ahelp hid="SW_METRICFIELD_TP_COLUMN_ED_HEIGHT">Enter the length of the separator line as a percentage of the height of the column area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_COLUMN_LB_POSITION" id="bm_id3143283" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_COLUMN:LB_POSITION" id="bm_id3143283" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3143271" role="heading" level="3" l10n="U"
oldref="17">Position</paragraph>
<paragraph xml-lang="en-US" id="par_id3149485" role="paragraph" l10n="U" oldref="18"><ahelp hid="SW_LISTBOX_TP_COLUMN_LB_POSITION">Select the vertical alignment of the separator line. This option is only available if <emph>Height</emph> value of the line is less than 100%.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_DLG_COLUMN_LB_APPLY_TO" id="bm_id3151258" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_COLUMN:LB_APPLY_TO" id="bm_id3151258" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3151248" role="heading" level="2" l10n="U"
oldref="50">Apply to</paragraph>
<paragraph xml-lang="en-US" id="par_id3154827" role="paragraph" l10n="U" oldref="51"><ahelp hid="SW_LISTBOX_DLG_COLUMN_LB_APPLY_TO">Select the item that you want to apply the column layout to.</ahelp> This option is only available if you access this dialog by choosing <emph>Format - Columns</emph>.</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/05040600.xhp b/helpcontent2/source/text/swriter/01/05040600.xhp
index e8e38953dd..c16b1d09ba 100644
--- a/helpcontent2/source/text/swriter/01/05040600.xhp
+++ b/helpcontent2/source/text/swriter/01/05040600.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textswriter0105040600xml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Footnote</title>
@@ -48,35 +48,34 @@
</section><comment>removed a note</comment>
<paragraph xml-lang="en-US" id="hd_id3154646" role="heading" level="2" l10n="U" oldref="3">Footnote area</paragraph>
<paragraph xml-lang="en-US" id="par_id3151168" role="paragraph" l10n="U" oldref="4">Set the height of the footnote area.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_FOOTNOTE_PAGE:RB_MAXHEIGHT_PAGE" id="bm_id3147509" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FOOTNOTE_PAGE:RB_MAXHEIGHT_PAGE" id="bm_id3147509" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3145412" role="heading" level="2" l10n="U" oldref="5">Not larger than page area</paragraph>
<paragraph xml-lang="en-US" id="par_id3147514" role="paragraph" l10n="U" oldref="6"><ahelp hid="SW:RADIOBUTTON:TP_FOOTNOTE_PAGE:RB_MAXHEIGHT_PAGE">Automatically adjusts the height of the footnote area depending on the number of footnotes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_FOOTNOTE_PAGE:RB_MAXHEIGHT" id="bm_id3149801" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FOOTNOTE_PAGE:RB_MAXHEIGHT" id="bm_id3149801" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3154099" role="heading" level="2" l10n="U" oldref="7">Maximum Footnote Height</paragraph>
- <paragraph xml-lang="en-US" id="par_id3149807" role="paragraph" l10n="U" oldref="8"><ahelp hid="SW:RADIOBUTTON:TP_FOOTNOTE_PAGE:RB_MAXHEIGHT">Sets a maximum height for the footnote area. Select this check box, and then enter the height.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_FOOTNOTE_PAGE:ED_MAXHEIGHT" id="bm_id3154482" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3154470" role="heading" level="2" l10n="U" oldref="9">Maximum Footnote Height</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149807" role="paragraph" l10n="U" oldref="8"><ahelp hid=".">Sets a maximum height for the footnote area. Enable this option, then enter the height.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FOOTNOTE_PAGE:ED_MAXHEIGHT" id="bm_id3154482" localize="false"/>
<paragraph xml-lang="en-US" id="par_id3154568" role="paragraph" l10n="U" oldref="10"><ahelp hid="SW:METRICFIELD:TP_FOOTNOTE_PAGE:ED_MAXHEIGHT">Enter the maximum height for the footnote area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_FOOTNOTE_PAGE:ED_DIST" id="bm_id3152958" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FOOTNOTE_PAGE:ED_DIST" id="bm_id3152958" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3151318" role="heading" level="2" l10n="U"
oldref="11">Distance from text</paragraph>
<paragraph xml-lang="en-US" id="par_id3153665" role="paragraph" l10n="U" oldref="12"><ahelp hid="SW:METRICFIELD:TP_FOOTNOTE_PAGE:ED_DIST">Enter the amount of space to leave between the bottom page margin and the first line of text in the footnote area.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id3155897" role="heading" level="2" l10n="U"
oldref="13">Separator Line</paragraph>
<paragraph xml-lang="en-US" id="par_id3149689" role="paragraph" l10n="U" oldref="14">Specifies the position and length of the separator line.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FOOTNOTE_PAGE:DLB_LINEPOS" id="bm_id3155177" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FOOTNOTE_PAGE:DLB_LINEPOS" id="bm_id3155177" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3154194" role="heading" level="2" l10n="U"
oldref="15">Position</paragraph>
<paragraph xml-lang="en-US" id="par_id3155184" role="paragraph" l10n="U" oldref="16"><ahelp hid="SW:LISTBOX:TP_FOOTNOTE_PAGE:DLB_LINEPOS">Select the horizontal alignment for the line that separates the main text from the footnote area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_FOOTNOTE_PAGE:ED_LINEWIDTH" id="bm_id3149492" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FOOTNOTE_PAGE:ED_LINEWIDTH" id="bm_id3149492" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3143284" role="heading" level="2" l10n="U"
oldref="17">Length</paragraph>
<paragraph xml-lang="en-US" id="par_id3154827" role="paragraph" l10n="U" oldref="18"><ahelp hid="SW:METRICFIELD:TP_FOOTNOTE_PAGE:ED_LINEWIDTH">Enter the length of the separator line as a percentage of the page width area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FOOTNOTE_PAGE:DLB_LINETYPE" id="bm_id3149098" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FOOTNOTE_PAGE:DLB_LINETYPE" id="bm_id3149098" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3151253" role="heading" level="2" l10n="U"
oldref="19">Weight</paragraph>
<paragraph xml-lang="en-US" id="par_id3149105" role="paragraph" l10n="U" oldref="20"><ahelp hid="SW:LISTBOX:TP_FOOTNOTE_PAGE:DLB_LINETYPE">Select the formatting style for the separator line. If you do not want a separator line, choose "0.0 pt".</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_FOOTNOTE_PAGE:ED_LINEDIST" id="bm_id3147098" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FOOTNOTE_PAGE:ED_LINEDIST" id="bm_id3147098" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3149828" role="heading" level="2" l10n="U"
oldref="21">Spacing</paragraph>
<paragraph xml-lang="en-US" id="par_id3148970" role="paragraph" l10n="U" oldref="22"><ahelp hid="SW:METRICFIELD:TP_FOOTNOTE_PAGE:ED_LINEDIST">Enter the amount of space to leave between the separator line and the first line of the footnote area.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/swriter/01/05040700.xhp b/helpcontent2/source/text/swriter/01/05040700.xhp
index a7efa86c26..6196beb60f 100644
--- a/helpcontent2/source/text/swriter/01/05040700.xhp
+++ b/helpcontent2/source/text/swriter/01/05040700.xhp
@@ -50,34 +50,34 @@
</section>
<paragraph xml-lang="en-US" role="note" id="par_id3149800" l10n="U" oldref="3">This tab is not available in <link href="text/swriter/01/03130000.xhp" name="Print Layout">Print Layout</link> view.</paragraph>
<paragraph role="heading" level="2" id="hd_id3153538" l10n="U" xml-lang="en-US" oldref="4">Footnotes</paragraph>
- <bookmark branch="hid/SW:CHECKBOX:TP_SECTION_FTNENDNOTES:CB_FTN_AT_TXTEND" xml-lang="en-US" id="bm_id3154572"/><paragraph role="heading" level="3" id="hd_id3154480" l10n="U" xml-lang="en-US" oldref="5">Collect at end of text</paragraph>
+ <bookmark branch="hid/sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_FTN_AT_TXTEND" xml-lang="en-US" id="bm_id3154572"/><paragraph role="heading" level="3" id="hd_id3154480" l10n="U" xml-lang="en-US" oldref="5">Collect at end of text</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3151309" xml-lang="en-US" oldref="11"><ahelp hid="SW:CHECKBOX:TP_SECTION_FTNENDNOTES:CB_FTN_AT_TXTEND" visibility="visible">Adds footnotes at the end of the section. If the section spans more than one page, the footnotes are added to the bottom of the page on which the footnote anchors appear.</ahelp></paragraph>
- <bookmark branch="hid/SW:CHECKBOX:TP_SECTION_FTNENDNOTES:CB_FTN_NUM" xml-lang="en-US" id="bm_id3153671"/><paragraph role="heading" level="3" id="hd_id3152960" l10n="U" xml-lang="en-US" oldref="6">Restart numbering</paragraph>
+ <bookmark branch="hid/sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_FTN_NUM" xml-lang="en-US" id="bm_id3153671"/><paragraph role="heading" level="3" id="hd_id3152960" l10n="U" xml-lang="en-US" oldref="6">Restart numbering</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3153677" xml-lang="en-US" oldref="12"><ahelp hid="SW:CHECKBOX:TP_SECTION_FTNENDNOTES:CB_FTN_NUM" visibility="visible">Restarts the footnote numbering at the number that you specify.</ahelp></paragraph>
- <bookmark branch="hid/SW:NUMERICFIELD:TP_SECTION_FTNENDNOTES:FLD_FTN_OFFSET" xml-lang="en-US" id="bm_id3154190"/><paragraph role="heading" level="3" id="hd_id3149688" l10n="U" xml-lang="en-US" oldref="13">Start at</paragraph>
+ <bookmark branch="hid/sw:NumericField:TP_SECTION_FTNENDNOTES:FLD_FTN_OFFSET" xml-lang="en-US" id="bm_id3154190"/><paragraph role="heading" level="3" id="hd_id3149688" l10n="U" xml-lang="en-US" oldref="13">Start at</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3154196" xml-lang="en-US" oldref="14"><ahelp hid="SW:NUMERICFIELD:TP_SECTION_FTNENDNOTES:FLD_FTN_OFFSET" visibility="visible">Enter the number that you want to assign the footnote.</ahelp></paragraph>
- <bookmark branch="hid/SW:CHECKBOX:TP_SECTION_FTNENDNOTES:CB_FTN_NUM_FMT" xml-lang="en-US" id="bm_id3143277"/><paragraph role="heading" level="3" id="hd_id3155185" l10n="U" xml-lang="en-US" oldref="15">Custom format</paragraph>
+ <bookmark branch="hid/sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_FTN_NUM_FMT" xml-lang="en-US" id="bm_id3143277"/><paragraph role="heading" level="3" id="hd_id3155185" l10n="U" xml-lang="en-US" oldref="15">Custom format</paragraph>
<paragraph l10n="U" xml-lang="en-US" role="paragraph" id="par_id3143283" oldref="16"><ahelp hid="SW:CHECKBOX:TP_SECTION_FTNENDNOTES:CB_FTN_NUM_FMT" visibility="visible">Specifies a custom numbering format for footnotes.</ahelp> This check box is only available if the <emph>Restart numbering</emph> check box is selected.</paragraph>
- <bookmark branch="hid/SW:EDIT:TP_SECTION_FTNENDNOTES:ED_FTN_PREFIX" xml-lang="en-US" id="bm_id3149821"/><paragraph role="heading" level="3" id="hd_id3151258" l10n="U" xml-lang="en-US" oldref="17">Before</paragraph>
+ <bookmark branch="hid/sw:Edit:TP_SECTION_FTNENDNOTES:ED_FTN_PREFIX" xml-lang="en-US" id="bm_id3149821"/><paragraph role="heading" level="3" id="hd_id3151258" l10n="U" xml-lang="en-US" oldref="17">Before</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3149827" xml-lang="en-US" oldref="18"><ahelp hid="SW:EDIT:TP_SECTION_FTNENDNOTES:ED_FTN_PREFIX" visibility="visible">Enter the text that you want to display in front of the footnote number.</ahelp></paragraph>
- <bookmark branch="hid/SW:LISTBOX:TP_SECTION_FTNENDNOTES:LB_FTN_NUMVIEW" xml-lang="en-US" id="bm_id3154839"/><paragraph role="heading" level="3" id="hd_id3154827" l10n="U" xml-lang="en-US" oldref="19">Spin button own format</paragraph>
+ <bookmark branch="hid/sw:ListBox:TP_SECTION_FTNENDNOTES:LB_FTN_NUMVIEW" xml-lang="en-US" id="bm_id3154839"/><paragraph role="heading" level="3" id="hd_id3154827" l10n="U" xml-lang="en-US" oldref="19">Spin button own format</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3147092" xml-lang="en-US" oldref="20"><ahelp hid="SW:LISTBOX:TP_SECTION_FTNENDNOTES:LB_FTN_NUMVIEW" visibility="visible">Select the numbering style for the footnotes.</ahelp></paragraph>
- <bookmark branch="hid/SW:EDIT:TP_SECTION_FTNENDNOTES:ED_FTN_SUFFIX" xml-lang="en-US" id="bm_id3147215"/><paragraph role="heading" level="3" id="hd_id3148975" l10n="U" xml-lang="en-US" oldref="21">After</paragraph>
+ <bookmark branch="hid/sw:Edit:TP_SECTION_FTNENDNOTES:ED_FTN_SUFFIX" xml-lang="en-US" id="bm_id3147215"/><paragraph role="heading" level="3" id="hd_id3148975" l10n="U" xml-lang="en-US" oldref="21">After</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3147221" xml-lang="en-US" oldref="22"><ahelp hid="SW:EDIT:TP_SECTION_FTNENDNOTES:ED_FTN_SUFFIX" visibility="visible">Enter the text that you want to display after the footnote number.</ahelp></paragraph>
<paragraph role="heading" level="2" id="hd_id3149044" l10n="U" xml-lang="en-US" oldref="7">Endnotes</paragraph>
- <bookmark branch="hid/SW:CHECKBOX:TP_SECTION_FTNENDNOTES:CB_END_AT_TXTEND" xml-lang="en-US" id="bm_id3147579"/><paragraph role="heading" level="3" id="hd_id3153639" l10n="U" xml-lang="en-US" oldref="8">Collect at end of section</paragraph>
+ <bookmark branch="hid/sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_END_AT_TXTEND" xml-lang="en-US" id="bm_id3147579"/><paragraph role="heading" level="3" id="hd_id3153639" l10n="U" xml-lang="en-US" oldref="8">Collect at end of section</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3147585" xml-lang="en-US" oldref="24"><ahelp hid="SW:CHECKBOX:TP_SECTION_FTNENDNOTES:CB_END_AT_TXTEND" visibility="visible">Adds endnotes at the end of the section.</ahelp></paragraph>
- <bookmark branch="hid/SW:CHECKBOX:TP_SECTION_FTNENDNOTES:CB_END_NUM" xml-lang="en-US" id="bm_id3155145"/><paragraph role="heading" level="3" id="hd_id3152780" l10n="U" xml-lang="en-US" oldref="9">Restart numbering</paragraph>
+ <bookmark branch="hid/sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_END_NUM" xml-lang="en-US" id="bm_id3155145"/><paragraph role="heading" level="3" id="hd_id3152780" l10n="U" xml-lang="en-US" oldref="9">Restart numbering</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3153345" xml-lang="en-US" oldref="25"><ahelp hid="SW:CHECKBOX:TP_SECTION_FTNENDNOTES:CB_END_NUM" visibility="visible">Restarts the endnote numbering at the number that you specify.</ahelp></paragraph>
- <bookmark branch="hid/SW:NUMERICFIELD:TP_SECTION_FTNENDNOTES:FLD_END_OFFSET" xml-lang="en-US" id="bm_id3149178"/><paragraph role="heading" level="3" id="hd_id3149166" l10n="U" xml-lang="en-US" oldref="26">Start at</paragraph>
+ <bookmark branch="hid/sw:NumericField:TP_SECTION_FTNENDNOTES:FLD_END_OFFSET" xml-lang="en-US" id="bm_id3149178"/><paragraph role="heading" level="3" id="hd_id3149166" l10n="U" xml-lang="en-US" oldref="26">Start at</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3156270" xml-lang="en-US" oldref="27"><ahelp hid="SW:NUMERICFIELD:TP_SECTION_FTNENDNOTES:FLD_END_OFFSET" visibility="visible">Enter the number that you want to assign the endnote.</ahelp></paragraph>
- <bookmark branch="hid/SW:CHECKBOX:TP_SECTION_FTNENDNOTES:CB_END_NUM_FMT" xml-lang="en-US" id="bm_id3151040"/><paragraph role="heading" level="3" id="hd_id3151027" l10n="U" xml-lang="en-US" oldref="28">Custom format</paragraph>
+ <bookmark branch="hid/sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_END_NUM_FMT" xml-lang="en-US" id="bm_id3151040"/><paragraph role="heading" level="3" id="hd_id3151027" l10n="U" xml-lang="en-US" oldref="28">Custom format</paragraph>
<paragraph l10n="U" xml-lang="en-US" role="paragraph" id="par_id3145776" oldref="29"><ahelp hid="SW:CHECKBOX:TP_SECTION_FTNENDNOTES:CB_END_NUM_FMT" visibility="visible">Specifies a custom numbering format for endnotes.</ahelp> This check box is only available if you the <emph>Restart numbering</emph> check box is selected.</paragraph>
- <bookmark branch="hid/SW:EDIT:TP_SECTION_FTNENDNOTES:ED_END_PREFIX" xml-lang="en-US" id="bm_id3155915"/><paragraph role="heading" level="3" id="hd_id3151383" l10n="U" xml-lang="en-US" oldref="30">Before</paragraph>
+ <bookmark branch="hid/sw:Edit:TP_SECTION_FTNENDNOTES:ED_END_PREFIX" xml-lang="en-US" id="bm_id3155915"/><paragraph role="heading" level="3" id="hd_id3151383" l10n="U" xml-lang="en-US" oldref="30">Before</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3155921" xml-lang="en-US" oldref="31"><ahelp hid="SW:EDIT:TP_SECTION_FTNENDNOTES:ED_END_PREFIX" visibility="visible">Enter the text that you want to display in front of the endnote number</ahelp></paragraph>
- <bookmark branch="hid/SW:LISTBOX:TP_SECTION_FTNENDNOTES:LB_END_NUMVIEW" xml-lang="en-US" id="bm_id3150118"/><paragraph role="heading" level="3" id="hd_id3150699" l10n="U" xml-lang="en-US" oldref="32">Spin button own format</paragraph>
+ <bookmark branch="hid/sw:ListBox:TP_SECTION_FTNENDNOTES:LB_END_NUMVIEW" xml-lang="en-US" id="bm_id3150118"/><paragraph role="heading" level="3" id="hd_id3150699" l10n="U" xml-lang="en-US" oldref="32">Spin button own format</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3150123" xml-lang="en-US" oldref="33"><ahelp hid="SW:LISTBOX:TP_SECTION_FTNENDNOTES:LB_END_NUMVIEW" visibility="visible">Select the numbering style for the endnotes.</ahelp></paragraph>
- <bookmark branch="hid/SW:EDIT:TP_SECTION_FTNENDNOTES:ED_END_SUFFIX" xml-lang="en-US" id="bm_id3147419"/><paragraph role="heading" level="3" id="hd_id3155871" l10n="U" xml-lang="en-US" oldref="34">After</paragraph>
+ <bookmark branch="hid/sw:Edit:TP_SECTION_FTNENDNOTES:ED_END_SUFFIX" xml-lang="en-US" id="bm_id3147419"/><paragraph role="heading" level="3" id="hd_id3155871" l10n="U" xml-lang="en-US" oldref="34">After</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3147425" xml-lang="en-US" oldref="35"><ahelp hid="SW:EDIT:TP_SECTION_FTNENDNOTES:ED_END_SUFFIX" visibility="visible">Enter the text that you want to display after the endnote number.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/swriter/01/05040800.xhp b/helpcontent2/source/text/swriter/01/05040800.xhp
index 8d3efef79a..f59dabfd5f 100755
--- a/helpcontent2/source/text/swriter/01/05040800.xhp
+++ b/helpcontent2/source/text/swriter/01/05040800.xhp
@@ -48,30 +48,30 @@
<section id="howtoget">
<embed href="text/swriter/00/00000405.xhp#textraster"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_TP_TEXTGRID_PAGE_RB_NOGRID" id="bm_id3145579" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_TP_TEXTGRID_PAGE_RB_LINESGRID" id="bm_id3145584" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_TP_TEXTGRID_PAGE_RB_CHARSGRID" id="bm_id3145588" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_TEXTGRID_PAGE:RB_NOGRID" id="bm_id3145579" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_TEXTGRID_PAGE:RB_LINESGRID" id="bm_id3145584" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_TEXTGRID_PAGE:RB_CHARSGRID" id="bm_id3145588" localize="false"/>
<paragraph role="heading" id="hd_id3154101" xml-lang="en-US" level="2" l10n="U" oldref="16">Grid</paragraph>
<paragraph role="paragraph" id="par_id3149805" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SW_RADIOBUTTON_TP_TEXTGRID_PAGE_RB_CHARSGRID">Adds or removes a text grid for lines or characters to the current page style.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153537" xml-lang="en-US" level="2" l10n="U" oldref="14">Grid layout</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_NUMERICFIELD_TP_TEXTGRID_PAGE_NF_LINESPERPAGE" id="bm_id3154570" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_TEXTGRID_PAGE:NF_LINESPERPAGE" id="bm_id3154570" localize="false"/>
<paragraph role="heading" id="hd_id3154478" xml-lang="en-US" level="3" l10n="U" oldref="12">Lines per page</paragraph>
<paragraph role="paragraph" id="par_id3151308" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SW_NUMERICFIELD_TP_TEXTGRID_PAGE_NF_LINESPERPAGE">Enter the maximum number of lines that you want on a page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_NUMERICFIELD_TP_TEXTGRID_PAGE_NF_CHARSPERLINE" id="bm_id3153668" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_TEXTGRID_PAGE:NF_CHARSPERLINE" id="bm_id3153668" localize="false"/>
<paragraph role="heading" id="hd_id3152957" xml-lang="en-US" level="3" l10n="U" oldref="10">Characters per line</paragraph>
<paragraph role="paragraph" id="par_id3153674" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SW_NUMERICFIELD_TP_TEXTGRID_PAGE_NF_CHARSPERLINE">Enter the maximum number of characters that you want on a line.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_METRICFIELD_TP_TEXTGRID_PAGE_MF_TEXTSIZE" id="bm_id3149696" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_TEXTGRID_PAGE:MF_TEXTSIZE" id="bm_id3149696" localize="false"/>
<paragraph role="heading" id="hd_id3149684" xml-lang="en-US" level="3" l10n="U" oldref="8">Max. base text size</paragraph>
<paragraph role="paragraph" id="par_id3154193" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SW_METRICFIELD_TP_TEXTGRID_PAGE_MF_TEXTSIZE">Enter the maximum base text size. A large value results in less characters per line.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_METRICFIELD_TP_TEXTGRID_PAGE_MF_RUBYSIZE" id="bm_id3143276" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_TEXTGRID_PAGE:MF_RUBYSIZE" id="bm_id3143276" localize="false"/>
<paragraph role="heading" id="hd_id3155182" xml-lang="en-US" level="3" l10n="U" oldref="6">Max. Ruby text size</paragraph>
<paragraph role="paragraph" id="par_id3143283" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SW_METRICFIELD_TP_TEXTGRID_PAGE_MF_RUBYSIZE">Enter the font size for the Ruby text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_TEXTGRID_PAGE_CB_RUBYBELOW" id="bm_id3151259" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TEXTGRID_PAGE:CB_RUBYBELOW" id="bm_id3151259" localize="false"/>
<paragraph role="heading" id="hd_id3149496" xml-lang="en-US" level="3" l10n="U" oldref="4">Ruby text below/left from base text</paragraph>
<paragraph role="paragraph" id="par_id3149816" xml-lang="en-US" l10n="U" oldref="3"><ahelp hid="SW_CHECKBOX_TP_TEXTGRID_PAGE_CB_RUBYBELOW">Displays Ruby text to the left of or below the base text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_TEXTGRID_PAGE_CB_DISPLAY" id="bm_id3154828" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_TEXTGRID_PAGE_CB_PRINT" id="bm_id3154832" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_TEXTGRID_PAGE_LB_COLOR" id="bm_id3154836" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TEXTGRID_PAGE:CB_DISPLAY" id="bm_id3154828" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TEXTGRID_PAGE:CB_PRINT" id="bm_id3154832" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TEXTGRID_PAGE:LB_COLOR" id="bm_id3154836" localize="false"/>
<paragraph role="heading" id="hd_id3149100" xml-lang="en-US" level="2" l10n="U" oldref="2">Grid display</paragraph>
<paragraph role="paragraph" id="par_id3147089" xml-lang="en-US" l10n="U" oldref="1"><ahelp hid="SW_LISTBOX_TP_TEXTGRID_PAGE_LB_COLOR">Specifies the printing and color options of the text grid.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/swriter/01/05060100.xhp b/helpcontent2/source/text/swriter/01/05060100.xhp
index d0b887bd4b..8dcf7f9a44 100644
--- a/helpcontent2/source/text/swriter/01/05060100.xhp
+++ b/helpcontent2/source/text/swriter/01/05060100.xhp
@@ -50,86 +50,86 @@
<embed href="text/swriter/00/00000405.xhp#grafiktyp"/>
</section>
<paragraph role="heading" id="hd_id3147168" xml-lang="en-US" level="2" l10n="U" oldref="3">Size</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_FRM_STD:ED_WIDTH" id="bm_id3150761" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_MetricField_RID_SVXPAGE_SWPOSSIZE_MF_WIDTH" id="bm_id9134495" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FRM_STD:ED_WIDTH" id="bm_id3150761" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_WIDTH" id="bm_id9134495" localize="false"/>
<paragraph role="heading" id="hd_id3147567" xml-lang="en-US" level="3" l10n="U" oldref="5">Width</paragraph>
<paragraph role="paragraph" id="par_id3151180" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:METRICFIELD:TP_FRM_STD:ED_WIDTH">Enter the width that you want for the selected object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_STD:CB_REL_WIDTH" id="bm_id3151177" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_STD:CB_REL_WIDTH" id="bm_id3151177" localize="false"/>
<paragraph role="heading" id="hd_id3154646" xml-lang="en-US" level="3" l10n="U" oldref="7">Relative</paragraph>
<paragraph role="paragraph" id="par_id3145413" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="SW:CHECKBOX:TP_FRM_STD:CB_REL_WIDTH">Calculates the width of the selected object as a percentage of the width of the page text area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_FRM_STD:ED_HEIGHT" id="bm_id3152948" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_MetricField_RID_SVXPAGE_SWPOSSIZE_MF_HEIGHT" id="bm_id9007232" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FRM_STD:ED_HEIGHT" id="bm_id3152948" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_HEIGHT" id="bm_id9007232" localize="false"/>
<paragraph role="heading" id="hd_id3147516" xml-lang="en-US" level="3" l10n="U" oldref="9">Height</paragraph>
<paragraph role="paragraph" id="par_id3154099" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:METRICFIELD:TP_FRM_STD:ED_HEIGHT">Enter the height that you want for the selected object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_STD:CB_REL_HEIGHT" id="bm_id3153535" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_STD:CB_REL_HEIGHT" id="bm_id3153535" localize="false"/>
<paragraph role="heading" id="hd_id3149809" xml-lang="en-US" level="3" l10n="U" oldref="11">Relative</paragraph>
<paragraph role="paragraph" id="par_id3154563" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SW:CHECKBOX:TP_FRM_STD:CB_REL_HEIGHT">Calculates the height of the selected object as a percentage of the height of the page text area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_STD:CB_FIXEDRATIO" id="bm_id3153668" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_SWPOSSIZE_CB_KEEPRATIO" id="bm_id7496566" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_STD:CB_FIXEDRATIO" id="bm_id3153668" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_KEEPRATIO" id="bm_id7496566" localize="false"/>
<paragraph role="heading" id="hd_id3151313" xml-lang="en-US" level="3" l10n="U" oldref="13">Keep ratio</paragraph>
<paragraph role="paragraph" id="par_id3153675" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW:CHECKBOX:TP_FRM_STD:CB_FIXEDRATIO">Maintains the height and width ratio when you change the width or the height setting.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_FRM_STD:BT_REALSIZE" id="bm_id3154482" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_FRM_STD:BT_REALSIZE" id="bm_id3154482" localize="false"/>
<paragraph role="heading" id="hd_id3154470" xml-lang="en-US" level="3" l10n="U" oldref="41">Original Size</paragraph>
<paragraph role="paragraph" id="par_id3155898" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SW:PUSHBUTTON:TP_FRM_STD:BT_REALSIZE">Resets the size settings of the selected object to the original values.</ahelp></paragraph>
<paragraph role="note" id="par_id3149102" xml-lang="en-US" l10n="U" oldref="44">This option is not available for frames.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_STD:CB_AUTOHEIGHT" id="bm_id3151255" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_FRM_STD_CB_AUTOWIDTH" id="bm_id358592" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_STD:CB_AUTOHEIGHT" id="bm_id3151255" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_STD:CB_AUTOWIDTH" id="bm_id358592" localize="false"/>
<paragraph role="heading" id="hd_id3149824" xml-lang="en-US" level="3" l10n="CHG" oldref="15">Automatic</paragraph>
<paragraph role="paragraph" id="par_id3151262" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="SW:CHECKBOX:TP_FRM_STD:CB_AUTOHEIGHT">Automatically adjusts the width or height of a frame to match the contents of the frame. If you want, you can specify a minimum width or minimum height for the frame.</ahelp></paragraph>
<paragraph role="note" id="par_id3152773" xml-lang="en-US" l10n="CHG" oldref="43">The <emph>Automatic</emph> option is only available when you select a frame.</paragraph>
<paragraph role="heading" id="hd_id3155144" xml-lang="en-US" level="2" l10n="U" oldref="17">Anchor</paragraph>
<paragraph role="paragraph" id="par_id3153352" xml-lang="en-US" l10n="CHG" oldref="18">Specify the anchoring options for the selected object or frame. The anchor options are not available when you open the dialog from the Styles and Formatting window.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_TP_FRM_STD_RB_ANCHOR_PAGE" id="bm_id3156280" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXPAGE_SWPOSSIZE_RB_TOPAGE" id="bm_id8638874" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FRM_STD:RB_ANCHOR_PAGE" id="bm_id3156280" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOPAGE" id="bm_id8638874" localize="false"/>
<paragraph role="heading" id="hd_id3156269" xml-lang="en-US" level="3" l10n="U" oldref="45">To page</paragraph>
<paragraph role="paragraph" id="par_id3149169" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="SW_RADIOBUTTON_TP_FRM_STD_RB_ANCHOR_PAGE">Anchors the selection to the current page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_TP_FRM_STD_RB_ANCHOR_PARA" id="bm_id3145771" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXPAGE_SWPOSSIZE_RB_TOPARA" id="bm_id5567796" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FRM_STD:RB_ANCHOR_PARA" id="bm_id3145771" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOPARA" id="bm_id5567796" localize="false"/>
<paragraph role="heading" id="hd_id3151028" xml-lang="en-US" level="3" l10n="U" oldref="60">To paragraph</paragraph>
<paragraph role="paragraph" id="par_id3145777" xml-lang="en-US" l10n="U" oldref="61"><ahelp hid="SW_RADIOBUTTON_TP_FRM_STD_RB_ANCHOR_PARA">Anchors the selection to the current paragraph.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_TP_FRM_STD_RB_ANCHOR_AT_CHAR" id="bm_id3151370" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXPAGE_SWPOSSIZE_RB_TOCHAR" id="bm_id89419" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FRM_STD:RB_ANCHOR_AT_CHAR" id="bm_id3151370" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOCHAR" id="bm_id89419" localize="false"/>
<paragraph role="heading" id="hd_id3155913" xml-lang="en-US" level="3" l10n="U" oldref="62">To character</paragraph>
<paragraph role="paragraph" id="par_id3151377" xml-lang="en-US" l10n="U" oldref="63"><ahelp hid="SW_RADIOBUTTON_TP_FRM_STD_RB_ANCHOR_AT_CHAR">Anchors the selection to a character.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_TP_FRM_STD_RB_ANCHOR_AS_CHAR" id="bm_id3155856" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXPAGE_SWPOSSIZE_RB_ASCHAR" id="bm_id2176274" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FRM_STD:RB_ANCHOR_AS_CHAR" id="bm_id3155856" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_ASCHAR" id="bm_id2176274" localize="false"/>
<paragraph role="heading" id="hd_id3150115" xml-lang="en-US" level="3" l10n="U" oldref="47">As character</paragraph>
<paragraph role="paragraph" id="par_id3155863" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SW_RADIOBUTTON_TP_FRM_STD_RB_ANCHOR_AS_CHAR">Anchors the selection as character. The height of the current line is resized to match the height of the selection.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3150693" xml-lang="en-US" level="2" l10n="U" oldref="25">Position</paragraph>
<paragraph role="paragraph" id="par_id3147413" xml-lang="en-US" l10n="U" oldref="26">Specify the location of the selected object on the current page.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FRM_STD:DLB_HORIZONTAL" id="bm_id3147500" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_SWPOSSIZE_LB_HORI" id="bm_id2376781" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FRM_STD:DLB_HORIZONTAL" id="bm_id3147500" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_HORI" id="bm_id2376781" localize="false"/>
<paragraph role="heading" id="hd_id3147488" xml-lang="en-US" level="3" l10n="U" oldref="27">Horizontal</paragraph>
<paragraph role="paragraph" id="par_id3145121" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SW:LISTBOX:TP_FRM_STD:DLB_HORIZONTAL">Select the horizontal alignment option for the object.</ahelp> This option is not available if you chose "anchor as character".</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_FRM_STD:ED_AT_HORZ_POS" id="bm_id3149565" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_MetricField_RID_SVXPAGE_SWPOSSIZE_MF_HORIBY" id="bm_id8156682" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FRM_STD:ED_AT_HORZ_POS" id="bm_id3149565" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_HORIBY" id="bm_id8156682" localize="false"/>
<paragraph role="heading" id="hd_id3149554" xml-lang="en-US" level="3" l10n="U" oldref="29">by</paragraph>
<paragraph role="paragraph" id="par_id3145258" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SW:METRICFIELD:TP_FRM_STD:ED_AT_HORZ_POS">Enter the amount of space to leave between the left edge of the selected object and the reference point that you select in the <emph>To</emph> box.</ahelp> This option is only available if you select "From Left" in the <emph>Horizontal</emph> box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FRM_STD:LB_HORI_RELATION" id="bm_id3150556" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_SWPOSSIZE_LB_HORITO" id="bm_id3423566" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FRM_STD:LB_HORI_RELATION" id="bm_id3150556" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_HORITO" id="bm_id3423566" localize="false"/>
<paragraph role="heading" id="hd_id3150545" xml-lang="en-US" level="3" l10n="U" oldref="48">to</paragraph>
<paragraph role="paragraph" id="par_id3149213" xml-lang="en-US" l10n="U" oldref="49"><ahelp hid="SW:LISTBOX:TP_FRM_STD:LB_HORI_RELATION">Select the reference point for the selected horizontal alignment option.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3149230" xml-lang="en-US" l10n="U" oldref="51">You can see the result of the alignments options that you select in the Preview box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_STD:CB_MIRROR" id="bm_id3146331" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_SWPOSSIZE_CB_HORIMIRROR" id="bm_id1756950" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_STD:CB_MIRROR" id="bm_id3146331" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_HORIMIRROR" id="bm_id1756950" localize="false"/>
<paragraph role="heading" id="hd_id3147746" xml-lang="en-US" level="3" l10n="U" oldref="52">Mirror on even pages</paragraph>
<paragraph role="paragraph" id="par_id3146337" xml-lang="en-US" l10n="U" oldref="53"><ahelp hid="SW:CHECKBOX:TP_FRM_STD:CB_MIRROR">Reverses the current horizontal alignment settings on even pages.</ahelp></paragraph>
<paragraph role="tip" id="par_id3148446" xml-lang="en-US" l10n="U" oldref="54">You can also use the <link href="text/swriter/01/05060300.xhp" name="Graphics"><emph>Graphics</emph></link> flip options to adjust the layout of objects on even and odd pages.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FRM_STD:DLB_VERTICAL" id="bm_id3145321" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_SWPOSSIZE_LB_VERT" id="bm_id7322305" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FRM_STD:DLB_VERTICAL" id="bm_id3145321" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_VERT" id="bm_id7322305" localize="false"/>
<paragraph role="heading" id="hd_id3145310" xml-lang="en-US" level="3" l10n="U" oldref="31">Vertical</paragraph>
<paragraph role="paragraph" id="par_id3150161" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SW:LISTBOX:TP_FRM_STD:DLB_VERTICAL">Select the vertical alignment option for the object.</ahelp></paragraph>
<paragraph role="note" id="par_id3150463" xml-lang="en-US" l10n="U" oldref="59">If you anchor an object to a frame with a fixed height, only the "Bottom" and "Center" alignment options are available.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_FRM_STD:ED_AT_VERT_POS" id="bm_id3156123" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_MetricField_RID_SVXPAGE_SWPOSSIZE_MF_VERTBY" id="bm_id8157292" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FRM_STD:ED_AT_VERT_POS" id="bm_id3156123" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_VERTBY" id="bm_id8157292" localize="false"/>
<paragraph role="heading" id="hd_id3154724" xml-lang="en-US" level="3" l10n="U" oldref="33">by</paragraph>
<paragraph role="paragraph" id="par_id3156130" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SW:METRICFIELD:TP_FRM_STD:ED_AT_VERT_POS">Enter the amount of space to leave between the top edge of the selected object and the reference point that you select in the <emph>To</emph> box.</ahelp> This option is only available if you select "From Top" or "From Bottom" (as character) in the <emph>Vertical</emph> box. </paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FRM_STD:LB_VERT_RELATION" id="bm_id3150923" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_SWPOSSIZE_LB_VERTTO" id="bm_id1466719" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FRM_STD:LB_VERT_RELATION" id="bm_id3150923" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_VERTTO" id="bm_id1466719" localize="false"/>
<paragraph role="heading" id="hd_id3150912" xml-lang="en-US" level="3" l10n="U" oldref="56">to</paragraph>
<paragraph role="paragraph" id="par_id3155075" xml-lang="en-US" l10n="U" oldref="57"><ahelp hid="SW:LISTBOX:TP_FRM_STD:LB_VERT_RELATION">Select the reference point for the selected vertical alignment option.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_FRM_STD_CB_FOLLOWTEXTFLOW" id="bm_id611285" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_SWPOSSIZE_CB_FOLLOW" id="bm_id4516434" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_STD:CB_FOLLOWTEXTFLOW" id="bm_id611285" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_FOLLOW" id="bm_id4516434" localize="false"/>
<paragraph role="heading" id="par_idN10A8E" xml-lang="en-US" level="3" l10n="NEW">Follow text flow</paragraph>
<paragraph role="paragraph" id="par_idN10A92" xml-lang="en-US" l10n="NEW"><ahelp hid="sw:CheckBox:TP_FRM_STD:CB_FOLLOWTEXTFLOW">Keeps the selected object within the layout boundaries of the text that the object is anchored to. To place the selected object anywhere in your document, do not select this option.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN10AA6" xml-lang="en-US" l10n="NEW">By default, the <emph>Follow text flow</emph> option is selected when you open a document that was created in a version of %PRODUCTNAME older than %PRODUCTNAME %PRODUCTVERSION. However, this option is not selected when you create a document or when you open a document in Microsoft Word format (*.doc).</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/05060200.xhp b/helpcontent2/source/text/swriter/01/05060200.xhp
index 1ea5ca0fb7..bf039d73dd 100644
--- a/helpcontent2/source/text/swriter/01/05060200.xhp
+++ b/helpcontent2/source/text/swriter/01/05060200.xhp
@@ -54,7 +54,7 @@
<paragraph role="heading" id="hd_id3154829" xml-lang="en-US" level="2" l10n="U" oldref="3">Settings</paragraph>
<bookmark xml-lang="en-US" branch="hid/FN_FRAME_NOWRAP" id="bm_id6970184" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:WrapOff" id="bm_id3148982" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGERADIOBUTTON:TP_FRM_WRAP:RB_NO_WRAP" id="bm_id3147090" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageRadioButton:TP_FRM_WRAP:RB_NO_WRAP" id="bm_id3147090" localize="false"/>
<paragraph role="heading" id="hd_id3148971" xml-lang="en-US" level="3" l10n="U" oldref="5">None</paragraph>
<paragraph role="paragraph" id="par_id3147100" xml-lang="en-US" l10n="U" oldref="6"><variable id="keinumlauftext"><ahelp hid="SW:IMAGERADIOBUTTON:TP_FRM_WRAP:RB_NO_WRAP">Places the object on a separate line in the document. The Text in the document appears above and below the object, but not on the sides of the object.</ahelp>
</variable></paragraph>
@@ -71,7 +71,7 @@
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGERADIOBUTTON:TP_FRM_WRAP:RB_WRAP_LEFT" id="bm_id3149164" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_LEFT" id="bm_id3149164" localize="false"/>
<paragraph role="heading" id="hd_id3153351" xml-lang="en-US" level="3" l10n="CHG" oldref="17">Before</paragraph>
<paragraph role="paragraph" id="par_id3149171" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:IMAGERADIOBUTTON:TP_FRM_WRAP:RB_WRAP_LEFT">Wraps text on the left side of the object if there is enough space.</ahelp></paragraph>
<table id="tbl_id3151031">
@@ -87,7 +87,7 @@
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGERADIOBUTTON:TP_FRM_WRAP:RB_WRAP_RIGHT" id="bm_id3150694" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_RIGHT" id="bm_id3150694" localize="false"/>
<paragraph role="heading" id="hd_id3155870" xml-lang="en-US" level="3" l10n="CHG" oldref="19">After</paragraph>
<paragraph role="paragraph" id="par_id3150700" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW:IMAGERADIOBUTTON:TP_FRM_WRAP:RB_WRAP_RIGHT">Wraps text on the right side of the object if there is enough space.</ahelp></paragraph>
<table id="tbl_id3147426">
@@ -104,7 +104,7 @@
</table>
<bookmark xml-lang="en-US" branch="hid/.uno:WrapOn" id="bm_id3149224" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGERADIOBUTTON:TP_FRM_WRAP:RB_WRAP_PARALLEL" id="bm_id3149228" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_PARALLEL" id="bm_id3149228" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/FN_FRAME_WRAP" id="bm_id0801200803382855" localize="false"/>
<paragraph role="heading" id="hd_id3149213" xml-lang="en-US" level="3" l10n="U" oldref="21">Parallel</paragraph>
<paragraph role="paragraph" id="par_id3147740" xml-lang="en-US" l10n="U" oldref="22"><variable id="seitenumlauftext"><ahelp hid="SW:IMAGERADIOBUTTON:TP_FRM_WRAP:RB_WRAP_PARALLEL">Wraps text on all four sides of the border frame of the object.</ahelp>
@@ -124,7 +124,7 @@
<bookmark xml-lang="en-US" branch="hid/FN_FRAME_WRAPTHRU" id="bm_id622670" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:WrapThrough" id="bm_id3151092" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGERADIOBUTTON:TP_FRM_WRAP:RB_WRAP_THROUGH" id="bm_id3151096" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_THROUGH" id="bm_id3151096" localize="false"/>
<paragraph role="heading" id="hd_id3151081" xml-lang="en-US" level="3" oldref="11">Through</paragraph>
<paragraph role="paragraph" id="par_id3154089" xml-lang="en-US" l10n="U" oldref="12"><variable id="durchlauftext"><ahelp hid="SW:IMAGERADIOBUTTON:TP_FRM_WRAP:RB_WRAP_THROUGH">Places the object in front of the text.</ahelp>
</variable></paragraph>
@@ -141,7 +141,7 @@
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGERADIOBUTTON:TP_FRM_WRAP:RB_WRAP_IDEAL" id="bm_id3150463" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_IDEAL" id="bm_id3150463" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/FN_FRAME_WRAP_IDEAL" id="bm_id5276" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:WrapIdeal" id="bm_id3150462" localize="false"/>
<paragraph role="heading" id="hd_id3150451" xml-lang="en-US" level="3" l10n="U" oldref="23">Optimal</paragraph>
@@ -162,39 +162,39 @@
<paragraph role="heading" id="hd_id3146940" xml-lang="en-US" level="2" l10n="U" oldref="26">Options</paragraph>
<paragraph role="paragraph" id="par_id3146953" xml-lang="en-US" l10n="U" oldref="27">Specify the text wrap options.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_WRAP:CB_ANCHOR_ONLY" id="bm_id3153240" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_WRAP:CB_ANCHOR_ONLY" id="bm_id3153240" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/FN_WRAP_ANCHOR_ONLY" id="bm_id7795797" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:WrapAnchorOnly" id="bm_id3154324" localize="false"/>
<paragraph role="heading" id="hd_id3153229" xml-lang="en-US" level="3" l10n="U" oldref="28">First Paragraph</paragraph>
<paragraph role="paragraph" id="par_id3154333" xml-lang="en-US" l10n="U" oldref="29"><variable id="ersterabsatztext"><ahelp hid=".uno:WrapAnchorOnly">Starts a new paragraph below the object after you press Enter.</ahelp> The space between the paragraphs is determined by the size of the object.
</variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_WRAP:CB_TRANSPARENT" id="bm_id3150086" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_WRAP:CB_TRANSPARENT" id="bm_id3150086" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/FN_FRAME_WRAPTHRU_TRANSP" id="bm_id7503356" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:WrapThroughTransparent" id="bm_id3150090" localize="false"/>
<paragraph role="heading" id="hd_id3148790" xml-lang="en-US" level="3" l10n="U" oldref="30">In Background</paragraph>
<paragraph role="paragraph" id="par_id3150100" xml-lang="en-US" l10n="U" oldref="31"><variable id="hintergrundtext"><ahelp hid=".uno:WrapThroughTransparent">Moves the selected object to the background. This option is only available if you selected the<emph> Through</emph> wrap type.</ahelp>
</variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_WRAP:CB_OUTLINE" id="bm_id3149369" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_WRAP:CB_OUTLINE" id="bm_id3149369" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/FN_FRAME_WRAP_CONTOUR" id="bm_id2682094" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:WrapContour" id="bm_id3149372" localize="false"/>
<paragraph role="heading" id="hd_id3149358" xml-lang="en-US" level="3" l10n="U" oldref="47">Contour</paragraph>
<paragraph role="paragraph" id="par_id3155793" xml-lang="en-US" l10n="U" oldref="48"><variable id="konturtext"><ahelp hid=".uno:WrapContour">Wraps text around the shape of the object. This option is not available for the <emph>Through</emph> wrap type, or for frames.</ahelp> To change the contour of an object, select the object, and then choose <emph>Format - Wrap - </emph><link href="text/swriter/01/05060201.xhp" name="Edit Contour"><emph>Edit Contour</emph></link>.
</variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_WRAP:CB_ONLYOUTSIDE" id="bm_id3154632" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_WRAP:CB_ONLYOUTSIDE" id="bm_id3154632" localize="false"/>
<paragraph role="heading" id="hd_id3154620" xml-lang="en-US" level="3" l10n="U" oldref="51">Only outside</paragraph>
<paragraph role="paragraph" id="par_id3147377" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="SW:CHECKBOX:TP_FRM_WRAP:CB_ONLYOUTSIDE">Wraps text only around the contour of the object, but not in open areas within the object shape.</ahelp> This option is not available for frames.</paragraph>
<paragraph role="heading" id="hd_id3147397" xml-lang="en-US" level="2" l10n="U" oldref="33">Gaps</paragraph>
<paragraph role="paragraph" id="par_id3149637" xml-lang="en-US" l10n="U" oldref="34">Specify the amount of space to leave between the selected object and the text.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_FRM_WRAP:ED_LEFT_MARGIN" id="bm_id3150671" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FRM_WRAP:ED_LEFT_MARGIN" id="bm_id3150671" localize="false"/>
<paragraph role="heading" id="hd_id3150659" xml-lang="en-US" level="3" l10n="U" oldref="35">Left</paragraph>
<paragraph role="paragraph" id="par_id3150678" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SW:METRICFIELD:TP_FRM_WRAP:ED_LEFT_MARGIN">Enter the amount of space that you want between the left edge of the object and the text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_FRM_WRAP:ED_RIGHT_MARGIN" id="bm_id3149949" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FRM_WRAP:ED_RIGHT_MARGIN" id="bm_id3149949" localize="false"/>
<paragraph role="heading" id="hd_id3154032" xml-lang="en-US" level="3" l10n="U" oldref="37">Right</paragraph>
<paragraph role="paragraph" id="par_id3149956" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="SW:METRICFIELD:TP_FRM_WRAP:ED_RIGHT_MARGIN">Enter the amount of space that you want between the right edge of the object and the text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_FRM_WRAP:ED_TOP_MARGIN" id="bm_id3147277" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FRM_WRAP:ED_TOP_MARGIN" id="bm_id3147277" localize="false"/>
<paragraph role="heading" id="hd_id3149974" xml-lang="en-US" level="3" l10n="U" oldref="39">Top</paragraph>
<paragraph role="paragraph" id="par_id3147284" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid="SW:METRICFIELD:TP_FRM_WRAP:ED_TOP_MARGIN">Enter the amount of space that you want between the top edge of the object and the text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_FRM_WRAP:ED_BOTTOM_MARGIN" id="bm_id3149621" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FRM_WRAP:ED_BOTTOM_MARGIN" id="bm_id3149621" localize="false"/>
<paragraph role="heading" id="hd_id3149609" xml-lang="en-US" level="3" l10n="U" oldref="41">Bottom</paragraph>
<paragraph role="paragraph" id="par_id3157884" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SW:METRICFIELD:TP_FRM_WRAP:ED_BOTTOM_MARGIN">Enter the amount of space that you want between the bottom edge of the object and the text.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/swriter/01/05060201.xhp b/helpcontent2/source/text/swriter/01/05060201.xhp
index e9c6a2eeb5..fcff3de090 100644
--- a/helpcontent2/source/text/swriter/01/05060201.xhp
+++ b/helpcontent2/source/text/swriter/01/05060201.xhp
@@ -40,7 +40,7 @@
</history>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="hid/SVX:FLOATINGWINDOW:RID_SVXDLG_CONTOUR" id="bm_id3151318" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:FloatingWindow:RID_SVXDLG_CONTOUR" id="bm_id3151318" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SID_CONTOUR_DLG" id="bm_id8126690" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:ContourDialog" id="bm_id3154564" localize="false"/>
<paragraph role="heading" id="hd_id3153539" xml-lang="en-US" level="1" l10n="U" oldref="1">Contour Editor</paragraph>
@@ -275,7 +275,7 @@
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXDLG_CONTOUR:MTF_TOLERANCE" id="bm_id3154729" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXDLG_CONTOUR:MTF_TOLERANCE" id="bm_id3154729" localize="false"/>
<paragraph role="heading" id="hd_id3149398" xml-lang="en-US" level="2" l10n="U" oldref="45">Tolerance</paragraph>
<paragraph role="paragraph" id="par_id3154735" xml-lang="en-US" l10n="U" oldref="47"><ahelp hid="SVX:METRICFIELD:RID_SVXDLG_CONTOUR:MTF_TOLERANCE">Enter the color tolerance for the eyedropper as a percentage. To increase the color range that the eyedropper selects, enter a high percentage.</ahelp></paragraph>
<section id="relatedtopics">
diff --git a/helpcontent2/source/text/swriter/01/05060300.xhp b/helpcontent2/source/text/swriter/01/05060300.xhp
index 573ff3d7e1..195515d8b8 100644
--- a/helpcontent2/source/text/swriter/01/05060300.xhp
+++ b/helpcontent2/source/text/swriter/01/05060300.xhp
@@ -51,32 +51,32 @@
<paragraph role="heading" id="hd_id3154191" xml-lang="en-US" level="2" l10n="U" oldref="3">Flip</paragraph>
<bookmark xml-lang="en-US" branch="hid/FN_FLIP_HORZ_GRAFIC" id="bm_id8328881" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:FlipHorizontal" id="bm_id3155185" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_GRF_EXT:CB_VERT" id="bm_id3143270" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_GRF_EXT:CB_VERT" id="bm_id3143270" localize="false"/>
<paragraph role="heading" id="hd_id3155174" xml-lang="en-US" level="3" l10n="U" oldref="7">Vertically<comment>see bug 106420;Writer uses VERT for HOR and HORZ for VERT</comment></paragraph>
<paragraph role="paragraph" id="par_id3149485" xml-lang="en-US" l10n="U" oldref="8"><variable id="vertikaltext"><ahelp hid="SW:CHECKBOX:TP_GRF_EXT:CB_VERT">Flips the selected graphic vertically.</ahelp>
</variable></paragraph>
<bookmark xml-lang="en-US" branch="hid/FN_FLIP_VERT_GRAFIC" id="bm_id9859908" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:FlipVertical" id="bm_id3151248" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_GRF_EXT:CB_HOR" id="bm_id3151251" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_GRF_EXT:CB_HOR" id="bm_id3151251" localize="false"/>
<paragraph role="heading" id="hd_id3154829" xml-lang="en-US" level="3" l10n="U" oldref="5">Horizontally</paragraph>
<paragraph role="paragraph" id="par_id3151261" xml-lang="en-US" l10n="U" oldref="6"><variable id="horizontaltext"><ahelp hid="SW:CHECKBOX:TP_GRF_EXT:CB_HOR">Flips the selected graphic horizontally.</ahelp>
</variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_TP_GRF_EXT_RB_MIRROR_ALL_PAGES" id="bm_id3148979" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_GRF_EXT:RB_MIRROR_ALL_PAGES" id="bm_id3148979" localize="false"/>
<paragraph role="heading" id="hd_id3147101" xml-lang="en-US" level="3" l10n="U" oldref="15">On all pages</paragraph>
<paragraph role="paragraph" id="par_id3147212" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW_RADIOBUTTON_TP_GRF_EXT_RB_MIRROR_ALL_PAGES">Flips the selected graphic horizontally on all pages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_TP_GRF_EXT_RB_MIRROR_LEFT_PAGES" id="bm_id3153644" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_GRF_EXT:RB_MIRROR_LEFT_PAGES" id="bm_id3153644" localize="false"/>
<paragraph role="heading" id="hd_id3153632" xml-lang="en-US" level="3" l10n="U" oldref="17">On left pages</paragraph>
<paragraph role="paragraph" id="par_id3149037" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW_RADIOBUTTON_TP_GRF_EXT_RB_MIRROR_LEFT_PAGES">Flips the selected graphic horizontally only on even pages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_TP_GRF_EXT_RB_MIRROR_RIGHT_PAGES" id="bm_id3152769" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_GRF_EXT:RB_MIRROR_RIGHT_PAGES" id="bm_id3152769" localize="false"/>
<paragraph role="heading" id="hd_id3147580" xml-lang="en-US" level="3" l10n="U" oldref="19">On right pages</paragraph>
<paragraph role="paragraph" id="par_id3152775" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW_RADIOBUTTON_TP_GRF_EXT_RB_MIRROR_RIGHT_PAGES">Flips the selected graphic horizontally only on odd pages.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#vorschau"/>
<paragraph role="heading" id="hd_id3153349" xml-lang="en-US" level="2" l10n="U" oldref="9">Link</paragraph>
<paragraph role="paragraph" id="par_id3149164" xml-lang="en-US" l10n="U" oldref="10">Inserts the graphic as a link.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_GRF_EXT:ED_CONNECT" id="bm_id3156272" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_GRF_EXT:ED_CONNECT" id="bm_id3156272" localize="false"/>
<paragraph role="heading" id="hd_id3149178" xml-lang="en-US" level="3" l10n="U" oldref="11">File name</paragraph>
<paragraph role="paragraph" id="par_id3156278" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:EDIT:TP_GRF_EXT:ED_CONNECT">Displays the path to the linked graphic file. To change the link, click the browse button (<emph>...</emph>) and then locate the file that you want to link to. </ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_GRF_EXT:PB_BROWSE" id="bm_id3145786" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_GRF_EXT:PB_BROWSE" id="bm_id3145786" localize="false"/>
<paragraph role="heading" id="hd_id3145776" xml-lang="en-US" level="3" l10n="U" oldref="13">...</paragraph>
<paragraph role="paragraph" id="par_id3151373" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW:PUSHBUTTON:TP_GRF_EXT:PB_BROWSE">Locate the new graphic file that you want to link to, and then click <emph>Open</emph>.</ahelp></paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/helpcontent2/source/text/swriter/01/05060700.xhp b/helpcontent2/source/text/swriter/01/05060700.xhp
index dcc49b9d69..0e2e59d717 100644
--- a/helpcontent2/source/text/swriter/01/05060700.xhp
+++ b/helpcontent2/source/text/swriter/01/05060700.xhp
@@ -43,7 +43,7 @@
</meta>
<body>
<section id="makro">
-<bookmark xml-lang="en-US" branch="hid/SFX2:TABPAGE:RID_SFX_TP_MACROASSIGN" id="bm_id3148770" localize="false"/>
+<!-- removed HID SFX2:TABPAGE:RID_SFX_TP_MACROASSIGN -->
<paragraph role="heading" id="hd_id3145241" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05060700.xhp" name="Macro">Macro</link></paragraph>
<paragraph role="paragraph" id="par_id3158429" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SFX2:TABPAGE:RID_SFX_TP_MACROASSIGN">Specifies the macro to run when you click a graphic, frame, or an OLE object.</ahelp></paragraph>
</section>
@@ -379,12 +379,12 @@
<bookmark xml-lang="en-US" branch="hid/HID_MACRO_MACROS" id="bm_id3767815" localize="false"/>
<paragraph role="heading" id="hd_id3156441" xml-lang="en-US" level="3" l10n="U" oldref="9">Macro name</paragraph>
<paragraph role="paragraph" id="par_id3148458" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SFX2:TABPAGE:RID_SFX_TP_MACROASSIGN">Lists the available macros. Select the macro that you want to assign to the selected event, and then click <emph>Assign</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:RID_SFX_TP_MACROASSIGN:PB_ASSIGN" id="bm_id3145185" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:RID_SFX_SMALLTP_MACROASSIGN:PB_ASSIGN" id="bm_id3145184" localize="false"/>
+<!-- removed HID SFX2:PUSHBUTTON:RID_SFX_TP_MACROASSIGN:PB_ASSIGN -->
+<!-- removed HID SFX2:PUSHBUTTON:RID_SFX_SMALLTP_MACROASSIGN:PB_ASSIGN -->
<paragraph role="heading" id="hd_id3145173" xml-lang="en-US" level="2" l10n="U" oldref="11">Assign</paragraph>
<paragraph role="paragraph" id="par_id3145197" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SFX2:PUSHBUTTON:RID_SFX_SMALLTP_MACROASSIGN:PB_ASSIGN">Assigns the selected macro to the selected event.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:RID_SFX_TP_MACROASSIGN:PB_DELETE" id="bm_id3150824" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:RID_SFX_SMALLTP_MACROASSIGN:PB_DELETE" id="bm_id3150822" localize="false"/>
+<!-- removed HID SFX2:PUSHBUTTON:RID_SFX_TP_MACROASSIGN:PB_DELETE -->
+<!-- removed HID SFX2:PUSHBUTTON:RID_SFX_SMALLTP_MACROASSIGN:PB_DELETE -->
<paragraph role="heading" id="hd_id3150811" xml-lang="en-US" level="2" l10n="U" oldref="15">Remove</paragraph>
<paragraph role="paragraph" id="par_id3150882" xml-lang="en-US" l10n="U" oldref="16"><variable id="aufheb"><ahelp hid="SFX2:PUSHBUTTON:RID_SFX_SMALLTP_MACROASSIGN:PB_DELETE">Removes the macro assignment from the selected entry.</ahelp>
</variable></paragraph>
diff --git a/helpcontent2/source/text/swriter/01/05060800.xhp b/helpcontent2/source/text/swriter/01/05060800.xhp
index 2e034f015b..a171a350dd 100755
--- a/helpcontent2/source/text/swriter/01/05060800.xhp
+++ b/helpcontent2/source/text/swriter/01/05060800.xhp
@@ -53,27 +53,27 @@
</section>
<paragraph xml-lang="en-US" id="hd_id3155180" role="heading" level="2" l10n="U" oldref="3">Link to</paragraph>
<paragraph xml-lang="en-US" id="par_id3143275" role="paragraph" l10n="U" oldref="4">Set the link properties.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FRM_URL:ED_URL" id="bm_id3154825" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FRM_URL:ED_URL" id="bm_id3154825" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3149485" role="heading" level="2" l10n="U" oldref="5">URL</paragraph>
<paragraph xml-lang="en-US" id="par_id3154831" role="paragraph" l10n="CHG" oldref="6"><ahelp hid="SW:EDIT:TP_FRM_URL:ED_URL">Enter the complete path to the file that you want to open.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_FRM_URL:PB_SEARCH" id="bm_id3149103" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_FRM_URL:PB_SEARCH" id="bm_id3149103" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3151260" role="heading" level="2" l10n="U"
oldref="17">Browse</paragraph>
<paragraph xml-lang="en-US" id="par_id3149109" role="paragraph" l10n="U" oldref="18"><ahelp hid="SW:PUSHBUTTON:TP_FRM_URL:PB_SEARCH">Locate the file that you want the hyperlink to open, and then click <emph>Open</emph>.</ahelp> The target file can be on your machine or on an <link href="text/shared/00/00000002.xhp#ftp" name="FTP server">FTP server</link> in the Internet.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FRM_URL:ED_NAME" id="bm_id3148983" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FRM_URL:ED_NAME" id="bm_id3148983" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3148972" role="heading" level="2" l10n="U"
oldref="19">Name</paragraph>
<paragraph xml-lang="en-US" id="par_id3147217" role="paragraph" l10n="U" oldref="20"><ahelp hid="SW:EDIT:TP_FRM_URL:ED_NAME">Enter a name for the hyperlink.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:COMBOBOX:TP_FRM_URL:CB_FRAME" id="bm_id3149035" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:TP_FRM_URL:CB_FRAME" id="bm_id3149035" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3153636" role="heading" level="2" l10n="U" oldref="7">Frame</paragraph>
<paragraph xml-lang="en-US" id="par_id3149042" role="paragraph" l10n="U" oldref="8"><ahelp hid="SW:COMBOBOX:TP_FRM_URL:CB_FRAME">Specify the name of the frame where you want to open the targeted file.</ahelp> The predefined target frame names are described <link href="text/shared/01/01100500.xhp" name="here">here</link>.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3152772" role="heading" level="2" l10n="U" oldref="9">Image Map</paragraph>
<paragraph xml-lang="en-US" id="par_id3155138" role="paragraph" l10n="U" oldref="10">Select the type of <link href="text/shared/00/00000002.xhp#imagemap" name="ImageMap">ImageMap</link> that you want to use. The ImageMap settings override the hyperlink settings that you enter on this page.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_URL:CB_SERVER" id="bm_id3149170" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_URL:CB_SERVER" id="bm_id3149170" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3153357" role="heading" level="2" l10n="U"
oldref="13">Server-side image map</paragraph>
<paragraph xml-lang="en-US" id="par_id3149176" role="paragraph" l10n="U" oldref="14"><ahelp hid="SW:CHECKBOX:TP_FRM_URL:CB_SERVER">Uses a server-side image map.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_URL:CB_CLIENT" id="bm_id3151029" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_URL:CB_CLIENT" id="bm_id3151029" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3156278" role="heading" level="2" l10n="U"
oldref="15">Client-side image map</paragraph>
<paragraph xml-lang="en-US" id="par_id3151036" role="paragraph" l10n="U" oldref="16"><ahelp hid="SW:CHECKBOX:TP_FRM_URL:CB_CLIENT">Uses the <link href="text/shared/01/02220000.xhp" name="image map">image map</link> that you created for the selected object.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/swriter/01/05060900.xhp b/helpcontent2/source/text/swriter/01/05060900.xhp
index f4730904a6..75f003c7a6 100644
--- a/helpcontent2/source/text/swriter/01/05060900.xhp
+++ b/helpcontent2/source/text/swriter/01/05060900.xhp
@@ -49,43 +49,43 @@
</section>
<paragraph role="heading" id="hd_id3151183" xml-lang="en-US" level="2" l10n="U" oldref="3">Name</paragraph>
<paragraph role="paragraph" id="par_id3147568" xml-lang="en-US" l10n="U" oldref="4">Specifies the name of the selected item, and associated links.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FRM_ADD:ED_NAME" id="bm_id3145419" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FRM_ADD:ED_NAME" id="bm_id3145419" localize="false"/>
<paragraph role="heading" id="hd_id3151178" xml-lang="en-US" level="3" l10n="U" oldref="5">Name</paragraph>
<paragraph role="paragraph" id="par_id3147510" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:EDIT:TP_FRM_ADD:ED_NAME">Enter a name for the selected item.</ahelp></paragraph>
<paragraph role="tip" id="par_id3154565" xml-lang="en-US" l10n="U" oldref="7">Assign an object, graphic or frame a meaningful name, so that you can quickly locate it afterwards in long documents.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FRM_ADD:ED_ALT_NAME" id="bm_id3150352" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FRM_ADD:ED_ALT_NAME" id="bm_id3150352" localize="false"/>
<paragraph role="heading" id="hd_id3153674" xml-lang="en-US" level="3" l10n="U" oldref="15">Alternative text (floating frames, graphics, and objects only)</paragraph>
<paragraph role="paragraph" id="par_id3150977" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SW:EDIT:TP_FRM_ADD:ED_ALT_NAME">Enter the text to display in a web browser when the selected item is unavailable. Alternate text is also used to assist people with disabilities.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FRM_ADD:ED_PREV" id="bm_id3149692" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FRM_ADD_LB_PREV" id="bm_id3149695" localize="false"/>
+<!-- removed HID SW:EDIT:TP_FRM_ADD:ED_PREV -->
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FRM_ADD:LB_PREV" id="bm_id3149695" localize="false"/>
<paragraph role="heading" id="hd_id3155903" xml-lang="en-US" level="3" l10n="U" oldref="23">Previous link</paragraph>
<paragraph role="paragraph" id="par_id3154192" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SW_LISTBOX_TP_FRM_ADD_LB_PREV">Displays the item (object, graphic, or frame) that comes before the current item in a linked sequence. To add or change the previous link, select a name from the list. If you are linking frames, the current frame and the target frame must be empty.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FRM_ADD:ED_NEXT" id="bm_id3155181" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FRM_ADD_LB_NEXT" id="bm_id3155185" localize="false"/>
+<!-- removed HID SW:EDIT:TP_FRM_ADD:ED_NEXT -->
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FRM_ADD:LB_NEXT" id="bm_id3155185" localize="false"/>
<paragraph role="heading" id="hd_id3159198" xml-lang="en-US" level="3" l10n="U" oldref="25">Next link</paragraph>
<paragraph role="paragraph" id="par_id3149485" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SW_LISTBOX_TP_FRM_ADD_LB_NEXT">Displays the item (object, graphic, or frame) that comes after the current item in a linked sequence. To add or change the next link, select a name from the list. If you are a linking frames, the target frame must be empty.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3143280" xml-lang="en-US" level="2" l10n="U" oldref="27">Protect</paragraph>
<paragraph role="paragraph" id="par_id3154834" xml-lang="en-US" l10n="U" oldref="28">Specifies protection options for the selected item.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_ADD:CB_PROTECT_CONTENT" id="bm_id3149098" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_ADD:CB_PROTECT_CONTENT" id="bm_id3149098" localize="false"/>
<paragraph role="heading" id="hd_id3149820" xml-lang="en-US" level="3" l10n="U" oldref="9">Protect Contents</paragraph>
<paragraph role="paragraph" id="par_id3149105" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SW:CHECKBOX:TP_FRM_ADD:CB_PROTECT_CONTENT">Prevents changes to the contents of the selected item.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3147099" xml-lang="en-US" l10n="U" oldref="29">You can still copy the contents of the selected item.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_ADD:CB_PROTECT_FRAME" id="bm_id3147218" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_ADD:CB_PROTECT_FRAME" id="bm_id3147218" localize="false"/>
<paragraph role="heading" id="hd_id3148979" xml-lang="en-US" level="3" l10n="U" oldref="10">Protect Position</paragraph>
<paragraph role="paragraph" id="par_id3147225" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SW:CHECKBOX:TP_FRM_ADD:CB_PROTECT_FRAME">Locks the position of the selected item in the current document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_ADD:CB_PROTECT_SIZE" id="bm_id3153640" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_ADD:CB_PROTECT_SIZE" id="bm_id3153640" localize="false"/>
<paragraph role="heading" id="hd_id3153629" xml-lang="en-US" level="3" l10n="U" oldref="12">Protect Size</paragraph>
<paragraph role="paragraph" id="par_id3147576" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SW:CHECKBOX:TP_FRM_ADD:CB_PROTECT_SIZE">Locks the size of the selected item.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3152770" xml-lang="en-US" level="2" l10n="U" oldref="8">Properties</paragraph>
<paragraph role="paragraph" id="par_id3155137" xml-lang="en-US" l10n="U" oldref="16">Specifies print and text options for the selected item.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_ADD:CB_EDIT_IN_READONLY" id="bm_id3153357" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_ADD:CB_EDIT_IN_READONLY" id="bm_id3153357" localize="false"/>
<paragraph role="heading" id="hd_id3153345" xml-lang="en-US" level="3" l10n="U" oldref="18">Editable in read-only document (frames only)</paragraph>
<paragraph role="paragraph" id="par_id3149167" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SW:CHECKBOX:TP_FRM_ADD:CB_EDIT_IN_READONLY">Allows you to edit the contents of a frame in a document that is read-only (write-protected).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_ADD:CB_PRINT_FRAME" id="bm_id3156281" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_ADD:CB_PRINT_FRAME" id="bm_id3156281" localize="false"/>
<paragraph role="heading" id="hd_id3156269" xml-lang="en-US" level="3" l10n="U" oldref="14">Print</paragraph>
<paragraph role="paragraph" id="par_id3151028" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW:CHECKBOX:TP_FRM_ADD:CB_PRINT_FRAME">Includes the selected item when you print the document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FRM_ADD_LB_TEXTFLOW" id="bm_id3145787" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FRM_ADD:LB_TEXTFLOW" id="bm_id3145787" localize="false"/>
<paragraph role="heading" id="hd_id3145776" xml-lang="en-US" level="3" l10n="U" oldref="33">Text flow</paragraph>
<paragraph role="paragraph" id="par_id3151374" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SW_LISTBOX_TP_FRM_ADD_LB_TEXTFLOW">Specifies the preferred text flow direction in a frame. To use the default text flow settings for the page, select <emph>Use superordinate object settings </emph>from the list.</ahelp></paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/helpcontent2/source/text/swriter/01/05090100.xhp b/helpcontent2/source/text/swriter/01/05090100.xhp
index 045071914f..d021992a83 100644
--- a/helpcontent2/source/text/swriter/01/05090100.xhp
+++ b/helpcontent2/source/text/swriter/01/05090100.xhp
@@ -54,46 +54,46 @@
<embed href="text/swriter/00/00000405.xhp#tabformat"/>
</section>
<paragraph role="heading" id="hd_id3154560" xml-lang="en-US" level="2" l10n="U" oldref="3">Properties</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FORMAT_TABLE:ED_NAME" id="bm_id3150019" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FORMAT_TABLE:ED_NAME" id="bm_id3150019" localize="false"/>
<paragraph role="heading" id="hd_id3149881" xml-lang="en-US" level="3" l10n="U" oldref="5">Name</paragraph>
<paragraph role="paragraph" id="par_id3145244" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:EDIT:TP_FORMAT_TABLE:ED_NAME">Enter an internal name for the table. You can use this name to quickly locate the table in the Navigator.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_FORMAT_TABLE:ED_WIDTH" id="bm_id3148773" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FORMAT_TABLE:ED_WIDTH" id="bm_id3148773" localize="false"/>
<paragraph role="heading" id="hd_id3150567" xml-lang="en-US" level="3" l10n="U" oldref="7">Width</paragraph>
<paragraph role="paragraph" id="par_id3149026" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:METRICFIELD:TP_FORMAT_TABLE:ED_WIDTH">Enter the width of the table.</ahelp> This check box is only available if the <emph>Automatic</emph> option in the <emph>Alignment</emph> area is not selected.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FORMAT_TABLE:CB_REL_WIDTH" id="bm_id3150764" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FORMAT_TABLE:CB_REL_WIDTH" id="bm_id3150764" localize="false"/>
<paragraph role="heading" id="hd_id3154644" xml-lang="en-US" level="3" l10n="U" oldref="9">Relative</paragraph>
<paragraph role="paragraph" id="par_id3151183" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:CHECKBOX:TP_FORMAT_TABLE:CB_REL_WIDTH">Displays the width of the table as a percentage of the page width.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3151168" xml-lang="en-US" level="2" l10n="U" oldref="13">Alignment</paragraph>
<paragraph role="paragraph" id="par_id3145412" xml-lang="en-US" l10n="U" oldref="14">Set the alignment options for the selected table.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_FORMAT_TABLE:RB_FULL" id="bm_id3154101" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FORMAT_TABLE:RB_FULL" id="bm_id3154101" localize="false"/>
<paragraph role="heading" id="hd_id3147511" xml-lang="en-US" level="3" l10n="U" oldref="15">Automatic</paragraph>
<paragraph role="paragraph" id="par_id3154108" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW:RADIOBUTTON:TP_FORMAT_TABLE:RB_FULL">Extends the table horizontally to the left and to the right page margins.</ahelp> This is the recommended setting for tables in HTML documents.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_FORMAT_TABLE:RB_LEFT" id="bm_id3153533" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FORMAT_TABLE:RB_LEFT" id="bm_id3153533" localize="false"/>
<paragraph role="heading" id="hd_id3149807" xml-lang="en-US" level="3" l10n="U" oldref="17">Left</paragraph>
<paragraph role="paragraph" id="par_id3153540" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:RADIOBUTTON:TP_FORMAT_TABLE:RB_LEFT">Aligns the left edge of the table to the left page margin.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_FORMAT_TABLE:RB_FROM_LEFT" id="bm_id3153666" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FORMAT_TABLE:RB_FROM_LEFT" id="bm_id3153666" localize="false"/>
<paragraph role="heading" id="hd_id3151311" xml-lang="en-US" level="3" l10n="U" oldref="36">Left margin</paragraph>
<paragraph role="paragraph" id="par_id3153672" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="SW:RADIOBUTTON:TP_FORMAT_TABLE:RB_FROM_LEFT">Aligns the left edge of the table to the indent that you enter in the <emph>Left </emph>box in the <emph>Spacing </emph>area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_FORMAT_TABLE:RB_RIGHT" id="bm_id3154480" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FORMAT_TABLE:RB_RIGHT" id="bm_id3154480" localize="false"/>
<paragraph role="heading" id="hd_id3150982" xml-lang="en-US" level="3" l10n="U" oldref="19">Right</paragraph>
<paragraph role="paragraph" id="par_id3154567" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW:RADIOBUTTON:TP_FORMAT_TABLE:RB_RIGHT">Aligns the right edge of the table to the right page margin.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_FORMAT_TABLE:RB_CENTER" id="bm_id3149689" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FORMAT_TABLE:RB_CENTER" id="bm_id3149689" localize="false"/>
<paragraph role="heading" id="hd_id3155899" xml-lang="en-US" level="3" l10n="U" oldref="21">Centered</paragraph>
<paragraph role="paragraph" id="par_id3149696" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SW:RADIOBUTTON:TP_FORMAT_TABLE:RB_CENTER">Centers the table horizontally on the page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_FORMAT_TABLE:RB_FREE" id="bm_id3159201" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FORMAT_TABLE:RB_FREE" id="bm_id3159201" localize="false"/>
<paragraph role="heading" id="hd_id3159188" xml-lang="en-US" level="3" l10n="U" oldref="23">Manual</paragraph>
<paragraph role="paragraph" id="par_id3155180" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SW:RADIOBUTTON:TP_FORMAT_TABLE:RB_FREE">Horizontally aligns the table based on the values that you enter in the <emph>Left</emph> and <emph>Right</emph> boxes in the<emph> Spacing</emph> area.</ahelp> $[officename] automatically calculates the table width. Select this option if you want to specify the individual <link href="text/swriter/01/05090200.xhp" name="column widths">column widths</link>.</paragraph>
<paragraph role="heading" id="hd_id3149824" xml-lang="en-US" level="2" l10n="U" oldref="25">Spacing</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_FORMAT_TABLE:ED_LEFT_DIST" id="bm_id3154829" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FORMAT_TABLE:ED_LEFT_DIST" id="bm_id3154829" localize="false"/>
<paragraph role="heading" id="hd_id3149102" xml-lang="en-US" level="3" l10n="U" oldref="27">Left</paragraph>
<paragraph role="paragraph" id="par_id3154836" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SW:METRICFIELD:TP_FORMAT_TABLE:ED_LEFT_DIST">Enter the amount of space that you want to leave between the left page margin and the edge of the table.</ahelp> This option is not available if the <emph>Automatic </emph>or the <emph>Left</emph> option is selected in the <emph>Alignment</emph> area.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_FORMAT_TABLE:ED_RIGHT_DIST" id="bm_id3147214" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FORMAT_TABLE:ED_RIGHT_DIST" id="bm_id3147214" localize="false"/>
<paragraph role="heading" id="hd_id3147094" xml-lang="en-US" level="3" l10n="U" oldref="29">Right</paragraph>
<paragraph role="paragraph" id="par_id3147220" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SW:METRICFIELD:TP_FORMAT_TABLE:ED_RIGHT_DIST">Enter the amount of space that you want to leave between the right page margin and the edge of the table.</ahelp> This option is not available if the <emph>Automatic </emph>or the <emph>Right</emph> option is selected in the <emph>Alignment</emph> area.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_FORMAT_TABLE:ED_TOP_DIST" id="bm_id3147587" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FORMAT_TABLE:ED_TOP_DIST" id="bm_id3147587" localize="false"/>
<paragraph role="heading" id="hd_id3147576" xml-lang="en-US" level="3" l10n="U" oldref="31">Above</paragraph>
<paragraph role="paragraph" id="par_id3152771" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SW:METRICFIELD:TP_FORMAT_TABLE:ED_TOP_DIST">Enter the amount of space that you want to leave between the top edge of the table and the text above the table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_FORMAT_TABLE:ED_BOTTOM_DIST" id="bm_id3145757" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FORMAT_TABLE:ED_BOTTOM_DIST" id="bm_id3145757" localize="false"/>
<paragraph role="heading" id="hd_id3155142" xml-lang="en-US" level="3" l10n="U" oldref="33">Below</paragraph>
<paragraph role="paragraph" id="par_id3145763" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SW:METRICFIELD:TP_FORMAT_TABLE:ED_BOTTOM_DIST">Enter the amount of space that you want to leave between the bottom edge of the table and the text below the table.</ahelp></paragraph>
<paragraph role="tip" id="par_id3145782" xml-lang="en-US" l10n="U" oldref="35">To insert a paragraph before a table at the beginning of a document, header or footer, place the cursor before any content in the first cell, and then press Enter.</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/05090200.xhp b/helpcontent2/source/text/swriter/01/05090200.xhp
index d832d1dad7..360fea6ac9 100755
--- a/helpcontent2/source/text/swriter/01/05090200.xhp
+++ b/helpcontent2/source/text/swriter/01/05090200.xhp
@@ -47,29 +47,29 @@
<section id="howtoget">
<embed href="text/swriter/00/00000405.xhp#spaltentab"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TABLE_COLUMN:CB_MOD_TBL" id="bm_id3154273" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TABLE_COLUMN:CB_MOD_TBL" id="bm_id3154273" localize="false"/>
<paragraph role="heading" id="hd_id3147510" xml-lang="en-US" level="2" l10n="U" oldref="3">Adapt table width</paragraph>
<paragraph role="paragraph" id="par_id3154280" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SW:CHECKBOX:TP_TABLE_COLUMN:CB_MOD_TBL">Maintains the current width of the table when you change the width of a column.</ahelp> This option is not available if <emph>Automatic</emph> is selected in the <emph>Alignment </emph>area on the <emph>Table </emph>tab.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TABLE_COLUMN:CB_PROP" id="bm_id3149809" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TABLE_COLUMN:CB_PROP" id="bm_id3149809" localize="false"/>
<paragraph role="heading" id="hd_id3145587" xml-lang="en-US" level="2" l10n="U" oldref="5">Adjust columns proportionally</paragraph>
<paragraph role="paragraph" id="par_id3153530" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:CHECKBOX:TP_TABLE_COLUMN:CB_PROP">Resizes the table width in relation to the column width that you enter.</ahelp> This option is not available if <emph>Automatic</emph> is selected in the <emph>Alignment </emph>area on the <emph>Table </emph>tab.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_TABLE_COLUMN:ED_SPACE" id="bm_id3154564" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_TABLE_COLUMN:ED_SPACE" id="bm_id3154564" localize="false"/>
<paragraph role="heading" id="hd_id3150349" xml-lang="en-US" level="2" l10n="U" oldref="7">Remaining space</paragraph>
<paragraph role="paragraph" id="par_id3154571" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:METRICFIELD:TP_TABLE_COLUMN:ED_SPACE">Displays the amount of space that is available for adjusting the width of the columns. To set the width of the table, click the <emph>Table </emph>tab.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154476" xml-lang="en-US" level="2" l10n="U" oldref="9">Column width</paragraph>
<paragraph role="paragraph" id="par_id3150976" xml-lang="en-US" l10n="U" oldref="10">Specify the column widths for the table.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_TABLE_COLUMN:COL_MF_1" id="bm_id3149690" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_TABLE_COLUMN:COL_MF_2" id="bm_id3149694" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_TABLE_COLUMN:COL_MF_3" id="bm_id3154188" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_TABLE_COLUMN:COL_MF_4" id="bm_id3154193" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_TABLE_COLUMN:COL_MF_5" id="bm_id3154197" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_TABLE_COLUMN:COL_MF_6" id="bm_id3154202" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_TABLE_COLUMN:COL_MF_1" id="bm_id3149690" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_TABLE_COLUMN:COL_MF_2" id="bm_id3149694" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_TABLE_COLUMN:COL_MF_3" id="bm_id3154188" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_TABLE_COLUMN:COL_MF_4" id="bm_id3154193" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_TABLE_COLUMN:COL_MF_5" id="bm_id3154197" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_TABLE_COLUMN:COL_MF_6" id="bm_id3154202" localize="false"/>
<paragraph role="heading" id="hd_id3155899" xml-lang="en-US" level="3" l10n="U" oldref="11">Column widths</paragraph>
<paragraph role="paragraph" id="par_id3159193" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:METRICFIELD:TP_TABLE_COLUMN:COL_MF_6">Enter the width that you want for the column.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGEBUTTON:TP_TABLE_COLUMN:COL_BTN_DOWN" id="bm_id3149487" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:TP_TABLE_COLUMN:COL_BTN_DOWN" id="bm_id3149487" localize="false"/>
<paragraph role="heading" id="hd_id3155182" xml-lang="en-US" level="3" l10n="U" oldref="13">Left Arrow</paragraph>
<paragraph role="paragraph" id="par_id3149494" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW:IMAGEBUTTON:TP_TABLE_COLUMN:COL_BTN_DOWN">Displays the table columns found to the left of the current column.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGEBUTTON:TP_TABLE_COLUMN:COL_BTN_UP" id="bm_id3149826" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:TP_TABLE_COLUMN:COL_BTN_UP" id="bm_id3149826" localize="false"/>
<paragraph role="heading" id="hd_id3149814" xml-lang="en-US" level="3" l10n="U" oldref="15">Right Arrow</paragraph>
<paragraph role="paragraph" id="par_id3149099" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW:IMAGEBUTTON:TP_TABLE_COLUMN:COL_BTN_UP">Displays the table columns found to the right of the current column.</ahelp></paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/helpcontent2/source/text/swriter/01/05090300.xhp b/helpcontent2/source/text/swriter/01/05090300.xhp
index 329a8de091..89a443a177 100644
--- a/helpcontent2/source/text/swriter/01/05090300.xhp
+++ b/helpcontent2/source/text/swriter/01/05090300.xhp
@@ -59,31 +59,31 @@ UFI: sw.features "Vertical formatting of individual table cells"; dedr: reviewed
<embed href="text/swriter/00/00000405.xhp#tabelletextfluss"/>
</section>
<paragraph role="heading" id="hd_id3153920" xml-lang="en-US" level="2" l10n="U" oldref="3">Text flow</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TABLE_TEXTFLOW:CB_PAGEBREAK" id="bm_id3147174" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TABLE_TEXTFLOW:CB_PAGEBREAK" id="bm_id3147174" localize="false"/>
<paragraph role="heading" id="hd_id3153720" xml-lang="en-US" level="3" l10n="U" oldref="4">Break</paragraph>
<paragraph role="paragraph" id="par_id3154643" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SW:CHECKBOX:TP_TABLE_TEXTFLOW:CB_PAGEBREAK">Select this check box, and then select the type of break that you want to associate with the table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_TABLE_TEXTFLOW:RB_BREAKPAGE" id="bm_id3147567" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_TABLE_TEXTFLOW:RB_BREAKPAGE" id="bm_id3147567" localize="false"/>
<paragraph role="heading" id="hd_id3151183" xml-lang="en-US" level="3" l10n="U" oldref="6">Page</paragraph>
<paragraph role="paragraph" id="par_id3149286" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SW:RADIOBUTTON:TP_TABLE_TEXTFLOW:RB_BREAKPAGE">Inserts a page break before or after the table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_TABLE_TEXTFLOW:RB_BREAKCOLUMN" id="bm_id3154479" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_TABLE_TEXTFLOW:RB_BREAKCOLUMN" id="bm_id3154479" localize="false"/>
<paragraph role="heading" id="hd_id3150981" xml-lang="en-US" level="3" l10n="U" oldref="8">Column</paragraph>
<paragraph role="paragraph" id="par_id3151310" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SW:RADIOBUTTON:TP_TABLE_TEXTFLOW:RB_BREAKCOLUMN">Inserts a column break before or after the table on a multi-column page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_TABLE_TEXTFLOW:RB_PAGEBREAKBEFORE" id="bm_id3149689" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_TABLE_TEXTFLOW:RB_PAGEBREAKBEFORE" id="bm_id3149689" localize="false"/>
<paragraph role="heading" id="hd_id3155898" xml-lang="en-US" level="3" l10n="U" oldref="10">Before</paragraph>
<paragraph role="paragraph" id="par_id3149695" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SW:RADIOBUTTON:TP_TABLE_TEXTFLOW:RB_PAGEBREAKBEFORE">Inserts a page or column break before the table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_TABLE_TEXTFLOW:RB_PAGEBREAKAFTER" id="bm_id3159201" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_TABLE_TEXTFLOW:RB_PAGEBREAKAFTER" id="bm_id3159201" localize="false"/>
<paragraph role="heading" id="hd_id3159189" xml-lang="en-US" level="3" l10n="U" oldref="12">After</paragraph>
<paragraph role="paragraph" id="par_id3155179" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SW:RADIOBUTTON:TP_TABLE_TEXTFLOW:RB_PAGEBREAKAFTER">Inserts a page or column break after the table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TABLE_TEXTFLOW:CB_PAGECOLL" id="bm_id3143276" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TABLE_TEXTFLOW:CB_PAGECOLL" id="bm_id3143276" localize="false"/>
<paragraph role="heading" id="hd_id3149490" xml-lang="en-US" level="3" l10n="U" oldref="14">With Page Style</paragraph>
<paragraph role="paragraph" id="par_id3143282" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SW:CHECKBOX:TP_TABLE_TEXTFLOW:CB_PAGECOLL">Applies the page style that you specify to the first page that follows the page break.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_TABLE_TEXTFLOW:LB_PAGECOLL" id="bm_id3151258" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TABLE_TEXTFLOW:LB_PAGECOLL" id="bm_id3151258" localize="false"/>
<paragraph role="heading" id="hd_id3154839" xml-lang="en-US" level="3" l10n="U" oldref="16">Page Style</paragraph>
<paragraph role="paragraph" id="par_id3149098" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SW:LISTBOX:TP_TABLE_TEXTFLOW:LB_PAGECOLL">Select the page style that you want to apply to the first page that follows the break.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_TABLE_TEXTFLOW:NF_PAGENUM" id="bm_id3148972" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_TABLE_TEXTFLOW:NF_PAGENUM" id="bm_id3148972" localize="false"/>
<paragraph role="heading" id="hd_id3149819" xml-lang="en-US" level="3" l10n="U" oldref="18">Page number</paragraph>
<paragraph role="paragraph" id="par_id3148978" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SW:NUMERICFIELD:TP_TABLE_TEXTFLOW:NF_PAGENUM">Enter the page number for the first page that follows the break.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TABLE_TEXTFLOW:CB_SPLIT" id="bm_id3147221" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TABLE_TEXTFLOW:CB_SPLIT" id="bm_id3147221" localize="false"/>
<paragraph role="heading" id="hd_id3147100" xml-lang="en-US" level="3" l10n="CHG" oldref="33">Allow table to split across pages and columns</paragraph>
<paragraph role="paragraph" id="par_id3153629" xml-lang="en-US" l10n="CHG" oldref="34"><ahelp hid="SW:CHECKBOX:TP_TABLE_TEXTFLOW:CB_SPLIT">Allows a page break or column break between the rows of a table.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sw:TriStateBox:TP_TABLE_TEXTFLOW:CB_SPLIT_ROW" id="bm_id3669240" localize="false"/>
@@ -91,13 +91,13 @@ UFI: sw.features "Vertical formatting of individual table cells"; dedr: reviewed
<bookmark xml-lang="en-US" branch="hid/.uno:RowSplit" id="bm_id6725669" localize="false"/>
<paragraph role="heading" id="par_idN108D6" xml-lang="en-US" level="3" l10n="NEW">Allow row to break across pages and columns</paragraph>
<paragraph role="paragraph" id="par_idN108DA" xml-lang="en-US" l10n="NEW"><ahelp hid="sw:TriStateBox:TP_TABLE_TEXTFLOW:CB_SPLIT_ROW">Allows a page break or column break inside a row of the table.</ahelp> This option is not applied to the first row in a table if the <emph>Repeat Heading</emph> option is selected.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TABLE_TEXTFLOW:CB_KEEP" id="bm_id3149046" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TABLE_TEXTFLOW:CB_KEEP" id="bm_id3149046" localize="false"/>
<paragraph role="heading" id="hd_id3149034" xml-lang="en-US" level="3" l10n="U" oldref="35">Keep with next paragraph</paragraph>
<paragraph role="paragraph" id="par_id3147577" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SW:CHECKBOX:TP_TABLE_TEXTFLOW:CB_KEEP">Keeps the table and the following paragraph together when you insert the break.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TABLE_TEXTFLOW:CB_HEADLINE" id="bm_id3155137" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TABLE_TEXTFLOW:CB_HEADLINE" id="bm_id3155137" localize="false"/>
<paragraph role="heading" id="hd_id3152772" xml-lang="en-US" level="3" l10n="U" oldref="19">Repeat heading</paragraph>
<paragraph role="paragraph" id="par_id3153350" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW:CHECKBOX:TP_TABLE_TEXTFLOW:CB_HEADLINE">Repeats the table heading on a new page when the table spans more than one page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_NUMERICFIELD_TP_TABLE_TEXTFLOW_NF_REPEAT_HEADER" id="bm_id3560289" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_TABLE_TEXTFLOW:NF_REPEAT_HEADER" id="bm_id3560289" localize="false"/>
<paragraph role="heading" id="par_idN1091C" xml-lang="en-US" level="3" l10n="NEW">The first ... rows</paragraph>
<paragraph role="paragraph" id="par_idN10920" xml-lang="en-US" l10n="NEW"><ahelp hid="sw:NumericField:TP_TABLE_TEXTFLOW:NF_REPEAT_HEADER">Enter the number of rows to include in the heading.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TABLE_TEXTFLOW:LB_TEXTDIRECTION" id="bm_id2659993" localize="false"/>
diff --git a/helpcontent2/source/text/swriter/01/05110100.xhp b/helpcontent2/source/text/swriter/01/05110100.xhp
index d8441160d8..cea0321989 100644
--- a/helpcontent2/source/text/swriter/01/05110100.xhp
+++ b/helpcontent2/source/text/swriter/01/05110100.xhp
@@ -48,10 +48,10 @@
<section id="howtoget">
<embed href="text/swriter/00/00000405.xhp#hoehez"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:DLG_ROW_HEIGHT:ED_HEIGHT" id="bm_id3145823" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:DLG_ROW_HEIGHT:ED_HEIGHT" id="bm_id3145823" localize="false"/>
<paragraph role="heading" id="hd_id3155625" xml-lang="en-US" level="2" l10n="U" oldref="3">Height</paragraph>
<paragraph role="paragraph" id="par_id3154554" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SW:METRICFIELD:DLG_ROW_HEIGHT:ED_HEIGHT">Enter the height that you want for the selected row(s).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_ROW_HEIGHT:CB_AUTOHEIGHT" id="bm_id3150019" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_ROW_HEIGHT:CB_AUTOHEIGHT" id="bm_id3150019" localize="false"/>
<paragraph role="heading" id="hd_id3149878" xml-lang="en-US" level="3" l10n="U" oldref="5">Fit to size</paragraph>
<paragraph role="paragraph" id="par_id3145244" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:CHECKBOX:DLG_ROW_HEIGHT:CB_AUTOHEIGHT">Automatically adjusts the row height to match the contents of the cells.</ahelp></paragraph>
<paragraph role="note" id="par_id3154646" xml-lang="en-US" l10n="CHG" oldref="7">You can also right-click in a cell, and then choose <link href="text/swriter/01/05110200.xhp" name="Row - Optimal Height"><emph>Row - Optimal Height</emph></link>.</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/05120100.xhp b/helpcontent2/source/text/swriter/01/05120100.xhp
index 974427f49f..906e175f55 100644
--- a/helpcontent2/source/text/swriter/01/05120100.xhp
+++ b/helpcontent2/source/text/swriter/01/05120100.xhp
@@ -51,10 +51,10 @@
<embed href="text/swriter/00/00000405.xhp#breites"/>
</section>
<paragraph role="heading" id="hd_id3083452" xml-lang="en-US" level="2" l10n="U" oldref="3">Width</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:DLG_COL_WIDTH:ED_COL" id="bm_id3149350" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_COL_WIDTH:ED_COL" id="bm_id3149350" localize="false"/>
<paragraph role="heading" id="hd_id3146323" xml-lang="en-US" level="3" l10n="U" oldref="4">Columns</paragraph>
<paragraph role="paragraph" id="par_id3145822" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SW:NUMERICFIELD:DLG_COL_WIDTH:ED_COL">Enter the column number of the column you want to change the width of.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:DLG_COL_WIDTH:ED_WIDTH" id="bm_id3150019" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:DLG_COL_WIDTH:ED_WIDTH" id="bm_id3150019" localize="false"/>
<paragraph role="heading" id="hd_id3154502" xml-lang="en-US" level="3" l10n="U" oldref="6">Width</paragraph>
<paragraph role="paragraph" id="par_id3149880" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SW:METRICFIELD:DLG_COL_WIDTH:ED_WIDTH">Enter the width that you want for the selected column(s).</ahelp><comment>removed 2 sentences, see #i64155</comment></paragraph>
</body>
diff --git a/helpcontent2/source/text/swriter/01/05120400.xhp b/helpcontent2/source/text/swriter/01/05120400.xhp
index 5dc23e57f1..4750691c87 100644
--- a/helpcontent2/source/text/swriter/01/05120400.xhp
+++ b/helpcontent2/source/text/swriter/01/05120400.xhp
@@ -46,22 +46,22 @@
<bookmark xml-lang="en-US" branch="hid/FN_TABLE_INSERT_COL_DLG" id="bm_id6403933" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:InsertColumnDialog" id="bm_id3149874" localize="false"/>
<paragraph role="paragraph" id="par_idN105A7" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Inserts a column into the table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:MODALDIALOG:DLG_INS_ROW_COL" id="bm_id3150250" localize="false"/>
+<!-- removed HID SW:MODALDIALOG:DLG_INS_ROW_COL -->
<paragraph role="heading" id="hd_id3148489" xml-lang="en-US" level="1" l10n="U" oldref="1">Insert Columns/Rows</paragraph>
<paragraph role="paragraph" id="par_id3151241" xml-lang="en-US" l10n="U" oldref="2"><variable id="einfuegentext"><ahelp hid="SW:MODALDIALOG:DLG_INS_ROW_COL">Inserts a row or column into the table.</ahelp> This command is only available when the cursor is in a table.
</variable></paragraph>
<section id="howtoget">
<embed href="text/swriter/00/00000405.xhp#einfgens"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:DLG_INS_ROW_COL:ED_COUNT" id="bm_id3146324" localize="false"/>
+<!-- removed HID SW:NUMERICFIELD:DLG_INS_ROW_COL:ED_COUNT -->
<paragraph role="heading" id="hd_id3083447" xml-lang="en-US" level="2" l10n="U" oldref="3">Insert</paragraph>
<paragraph role="paragraph" id="par_id3155626" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SW:NUMERICFIELD:DLG_INS_ROW_COL:ED_COUNT">Enter the number of columns or rows that you want.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3145829" xml-lang="en-US" level="2" l10n="U" oldref="6">Position</paragraph>
<paragraph role="paragraph" id="par_id3154504" xml-lang="en-US" l10n="U" oldref="11">Specifies where to insert the columns or rows.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_INS_ROW_COL:CB_POS_BEFORE" id="bm_id3145245" localize="false"/>
+<!-- removed HID SW:RADIOBUTTON:DLG_INS_ROW_COL:CB_POS_BEFORE -->
<paragraph role="heading" id="hd_id3150015" xml-lang="en-US" level="3" l10n="U" oldref="7">Before</paragraph>
<paragraph role="paragraph" id="par_id3150564" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:RADIOBUTTON:DLG_INS_ROW_COL:CB_POS_BEFORE">Adds new columns to the left of the current column, or adds new rows above the current row.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_INS_ROW_COL:CB_POS_AFTER" id="bm_id3153924" localize="false"/>
+<!-- removed HID SW:RADIOBUTTON:DLG_INS_ROW_COL:CB_POS_AFTER -->
<paragraph role="heading" id="hd_id3149024" xml-lang="en-US" level="3" l10n="U" oldref="9">After</paragraph>
<paragraph role="paragraph" id="par_id3153718" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:RADIOBUTTON:DLG_INS_ROW_COL:CB_POS_AFTER">Adds new columns to the right of the current column, or adds new rows below the current row.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/swriter/01/05130000.xhp b/helpcontent2/source/text/swriter/01/05130000.xhp
index ea51b2b5f3..711f9bf33a 100644
--- a/helpcontent2/source/text/swriter/01/05130000.xhp
+++ b/helpcontent2/source/text/swriter/01/05130000.xhp
@@ -57,7 +57,7 @@ DEDR: Reviewed</lastedited>
<paragraph role="paragraph" id="par_id3149052" xml-lang="en-US" l10n="CHG" oldref="2">The following information concerns Writer styles that you can apply using the <link href="text/swriter/01/05140000.xhp">Styles and Formatting</link> window.</paragraph>
</section>
<paragraph role="paragraph" id="par_id3150015" xml-lang="en-US" l10n="U" oldref="62">If you want, you can edit the styles of the current document, and then save the document as a template. To save the document as template, choose <emph>File - </emph><link href="text/shared/01/01110300.xhp" name="Templates - Save"><emph>Templates - Save</emph></link>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:LISTBOX:RID_STYLECATALOG:BT_TOOL" id="bm_id3153921" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:ListBox:RID_STYLECATALOG:BT_TOOL" id="bm_id3153921" localize="false"/>
<paragraph role="heading" id="hd_id3150572" xml-lang="en-US" level="2" l10n="U" oldref="4">Style Category</paragraph>
<paragraph role="paragraph" id="par_id3153721" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SFX2:LISTBOX:RID_STYLECATALOG:BT_TOOL">These are the different categories of formatting styles.</ahelp></paragraph>
<table id="tbl_id3154642">
diff --git a/helpcontent2/source/text/swriter/01/05130100.xhp b/helpcontent2/source/text/swriter/01/05130100.xhp
index b404eda5c8..88a73e98b9 100644
--- a/helpcontent2/source/text/swriter/01/05130100.xhp
+++ b/helpcontent2/source/text/swriter/01/05130100.xhp
@@ -73,7 +73,7 @@
<paragraph role="paragraph" id="par_id3145412" xml-lang="en-US" l10n="U" oldref="27">The header text now has the attributes you specified in the Header Paragraph Style, while the other parts of the document have the attributes defined in the business letter conditional Paragraph Style.</paragraph>
<paragraph role="tip" id="par_id3154473" xml-lang="en-US" l10n="U" oldref="13">The "Text body" Style was created as a conditional style. Therefore, any styles you derive from it can be used as conditional styles.</paragraph>
<paragraph role="paragraph" id="par_id3151321" xml-lang="en-US" l10n="U" oldref="14">The Paragraph Style applied to the context is used when exporting to other formats (RTF, HTML, and so on).</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_CONDCOLL:CB_CONDITION" id="bm_id3152963" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONDCOLL:CB_CONDITION" id="bm_id3152963" localize="false"/>
<paragraph role="heading" id="hd_id3152952" xml-lang="en-US" level="2" l10n="U" oldref="3">Conditional style</paragraph>
<paragraph role="paragraph" id="par_id3150974" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SW:CHECKBOX:TP_CONDCOLL:CB_CONDITION">Check this box to define a new style as a conditional style.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_COND_COLL_TABLIST" id="bm_id3147524" localize="false"/>
@@ -81,14 +81,14 @@
<paragraph role="paragraph" id="par_id3147530" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="HID_COND_COLL_TABLIST">Here you can see the $[officename] predefined contexts, including outline levels 1 to 10, numbering/bullets levels 1 to 10, table header, table contents, section, border, footnote, header and footer.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3155896" xml-lang="en-US" level="2" l10n="U" oldref="5">Applied Style</paragraph>
<paragraph role="paragraph" id="par_id3149689" xml-lang="en-US" l10n="U" oldref="17">Here you can see the list of all Paragraph Styles applied to a context.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_CONDCOLL:LB_STYLE" id="bm_id3159190" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_CONDCOLL:LB_STYLE" id="bm_id3159190" localize="false"/>
<paragraph role="heading" id="hd_id3154194" xml-lang="en-US" level="2" l10n="U" oldref="6">Styles</paragraph>
<paragraph role="paragraph" id="par_id3159195" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:LISTBOX:TP_CONDCOLL:LB_STYLE">A list of all Paragraph Styles which can be assigned to a context is contained in the list box.</ahelp></paragraph>
<embed href="text/swriter/01/05130000.xhp#vorlagenbereich"/>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_CONDCOLL:PB_REMOVE" id="bm_id3151329" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_CONDCOLL:PB_REMOVE" id="bm_id3151329" localize="false"/>
<paragraph role="heading" id="hd_id3149306" xml-lang="en-US" level="2" l10n="U" oldref="8">Remove</paragraph>
<paragraph role="paragraph" id="par_id3151335" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SW:PUSHBUTTON:TP_CONDCOLL:PB_REMOVE">Click here to remove the current context assigned to the selected style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_CONDCOLL:PB_ASSIGN" id="bm_id3149494" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_CONDCOLL:PB_ASSIGN" id="bm_id3149494" localize="false"/>
<paragraph role="heading" id="hd_id3149483" xml-lang="en-US" level="2" l10n="U" oldref="9">Assign</paragraph>
<paragraph role="paragraph" id="par_id3154829" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW:PUSHBUTTON:TP_CONDCOLL:PB_ASSIGN">Click <emph>Assign</emph> to apply the <emph>selected Paragraph Style</emph> to the defined <emph>context</emph>.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/swriter/01/05150000.xhp b/helpcontent2/source/text/swriter/01/05150000.xhp
index 54527cdee8..da8205e083 100755
--- a/helpcontent2/source/text/swriter/01/05150000.xhp
+++ b/helpcontent2/source/text/swriter/01/05150000.xhp
@@ -6,10 +6,13 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
*
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
+ *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,27 +35,27 @@
<meta>
-<topic id="textswriter0105150000xml" indexer="include">
-<title id="tit" xml-lang="en-US">AutoCorrect</title>
-<filename>/text/swriter/01/05150000.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="autoformat">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3153925"><bookmark_value>AutoFormat function; text documents</bookmark_value>
-</bookmark>
-<paragraph role="heading" id="hd_id3153925" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05150000.xhp" name="AutoFormat">AutoCorrect</link></paragraph>
-<paragraph role="paragraph" id="par_id3151182" xml-lang="en-US" l10n="U" oldref="2">Automatically formats the file according to the options that you set under <link href="text/shared/01/06040000.xhp" name="Tools - AutoCorrect"><emph>Tools - AutoCorrect</emph>
-<emph> Options</emph></link>.</paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/swriter/00/00000405.xhp#autoformat1"/>
-</section>
-<embed href="text/swriter/01/05150100.xhp#eingabe"/>
-<embed href="text/swriter/01/05150200.xhp#dokument"/>
-<embed href="text/swriter/01/05150300.xhp#ananbe"/>
-<paragraph role="heading" id="hd_id1029200810080924" xml-lang="en-US" level="2" l10n="NEW"><link href="text/shared/01/06040000.xhp">AutoCorrect Options</link></paragraph>
-<paragraph role="paragraph" id="par_id1029200810080924" xml-lang="en-US" l10n="NEW">Opens the AutoCorrect dialog.</paragraph>
-<paragraph role="paragraph" id="par_id3147570" xml-lang="en-US" l10n="CHG" oldref="3">To open the <link href="text/swriter/01/05150101.xhp" name="AutoFormat for Tables">AutoFormat for Tables</link> dialog, click in a table cell, and then choose <emph>Table - AutoFormat</emph>.</paragraph>
-</body>
-</helpdocument>
+ <topic id="textswriter0105150000xml" indexer="include">
+ <title xml-lang="en-US" id="tit">AutoCorrect</title>
+ <filename>/text/swriter/01/05150000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="autoformat">
+<bookmark xml-lang="en-US" branch="index" id="bm_id3153925"><bookmark_value>AutoCorrect function;text documents</bookmark_value>
+</bookmark><comment>MW changed AutoFormat to AutoCorrect</comment>
+<paragraph xml-lang="en-US" id="hd_id3153925" role="heading" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05150000.xhp" name="AutoFormat">AutoCorrect</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151182" role="paragraph" l10n="U" oldref="2">Automatically formats the file according to the options that you set under <link href="text/shared/01/06040000.xhp" name="Tools - AutoCorrect"><emph>Tools - AutoCorrect</emph>
+ <emph>Options</emph></link>.</paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/swriter/00/00000405.xhp#autoformat1"/>
+ </section>
+ <embed href="text/swriter/01/05150100.xhp#eingabe"/>
+ <embed href="text/swriter/01/05150200.xhp#dokument"/>
+ <embed href="text/swriter/01/05150300.xhp#ananbe"/>
+ <paragraph xml-lang="en-US" id="hd_id1029200810080924" role="heading" level="2" l10n="NEW"><link href="text/shared/01/06040000.xhp">AutoCorrect Options</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id1029200810080924" role="paragraph" l10n="NEW">Opens the AutoCorrect dialog.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147570" role="paragraph" l10n="CHG" oldref="3">To open the <link href="text/swriter/01/05150101.xhp" name="AutoFormat for Tables">AutoFormat for Tables</link> dialog, click in a table cell, and then choose <emph>Table - AutoFormat</emph>.</paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/01/05150101.xhp b/helpcontent2/source/text/swriter/01/05150101.xhp
index 26aead9046..b0b5c17ae4 100644
--- a/helpcontent2/source/text/swriter/01/05150101.xhp
+++ b/helpcontent2/source/text/swriter/01/05150101.xhp
@@ -1,15 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
*
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
+ *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,89 +32,95 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriter0105150101xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">AutoFormat for Tables</title>
-<filename>/text/swriter/01/05150101.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-16T13:54:59">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textswriter0105150101xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">AutoFormat for Tables</title>
+ <filename>/text/swriter/01/05150101.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="hid/SID_AUTOFORMAT" id="bm_id4963785" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:AutoFormat" id="bm_id3150343" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_AUTOFMT_TABLE" id="bm_id3150249" localize="false"/>
<bookmark xml-lang="en-US" branch="index" id="bm_id2655415"><bookmark_value>tables;AutoFormat function</bookmark_value>
-<bookmark_value>AutoFormat function;applying to text tables</bookmark_value>
-<bookmark_value>styles;table styles</bookmark_value>
-</bookmark><comment>MW changed "tables styles;" to "styles;"</comment>
-<paragraph role="heading" id="hd_id3148485" xml-lang="en-US" level="1" l10n="U" oldref="1">AutoFormat for Tables</paragraph>
-<paragraph role="paragraph" id="par_id3149500" xml-lang="en-US" l10n="U" oldref="2"><variable id="autoformattabelle"><ahelp hid="HID_AUTOFMT_TABLE">Automatically applies formats to the current table, including fonts, shading, and borders.</ahelp>
+ <bookmark_value>styles;table styles</bookmark_value>
+ <bookmark_value>AutoFormat function for tables</bookmark_value>
+</bookmark><comment>MW changed "tables styles;" to "styles;"</comment><comment>MW made "AutoFormat function;" a one level entry</comment>
+<paragraph xml-lang="en-US" id="hd_id3148485" role="heading" level="1" l10n="U" oldref="1">AutoFormat for Tables</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149500" role="paragraph" l10n="U" oldref="2"><variable id="autoformattabelle"><ahelp hid="HID_AUTOFMT_TABLE">Automatically applies formats to the current table, including fonts, shading, and borders.</ahelp>
</variable></paragraph>
-<section id="howtoget">
- <embed href="text/swriter/00/00000405.xhp#autoformattab"/>
-</section>
-<paragraph role="heading" id="hd_id3151388" xml-lang="en-US" level="2" l10n="U" oldref="3">Applying an AutoFormat to a Table</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3145828" xml-lang="en-US" l10n="U" oldref="4">Click in a table cell, or select the cells that you want to format.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153006" xml-lang="en-US" l10n="CHG" oldref="5">Choose <emph>Table - AutoFormat</emph>, and then click the format that you to want to apply.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145585" xml-lang="en-US" l10n="U" oldref="30">Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:DLG_AUTOFMT_TABLE:LB_FORMAT" id="bm_id3148770" localize="false"/>
-<paragraph role="heading" id="hd_id3148386" xml-lang="en-US" level="2" l10n="U" oldref="8">Format</paragraph>
-<paragraph role="paragraph" id="par_id3149022" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SW:LISTBOX:DLG_AUTOFMT_TABLE:LB_FORMAT">Lists the available formatting styles for tables. Click the format that you want to apply, and then click <emph>OK</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_AUTOFMT_TABLE:BTN_ADD" id="bm_id3147174" localize="false"/>
-<paragraph role="heading" id="hd_id3153722" xml-lang="en-US" level="2" l10n="U" oldref="10">Add</paragraph>
-<paragraph role="paragraph" id="par_id3151185" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SW:PUSHBUTTON:DLG_AUTOFMT_TABLE:BTN_ADD">Adds a new table style to the list.</ahelp></paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154646" xml-lang="en-US" l10n="U" oldref="12">Format a table in your document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156320" xml-lang="en-US" l10n="CHG" oldref="13">Select the table, and then choose <emph>Table - AutoFormat</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153156" xml-lang="en-US" l10n="U" oldref="14">Click <emph>Add</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151168" xml-lang="en-US" l10n="U" oldref="15">In the <link href="text/shared/01/05150101.xhp" name="Add AutoFormat"><emph>Add AutoFormat</emph></link> dialog, enter a name, and then click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_AUTOFMT_TABLE:BTN_REMOVE" id="bm_id3154280" localize="false"/>
-<paragraph role="heading" id="hd_id3147516" xml-lang="en-US" level="2" l10n="U" oldref="16">Delete</paragraph>
-<paragraph role="paragraph" id="par_id3150707" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SW:PUSHBUTTON:DLG_AUTOFMT_TABLE:BTN_REMOVE">Deletes the selected table style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:MOREBUTTON:DLG_AUTOFMT_TABLE:BTN_MORE" id="bm_id3154103" localize="false"/>
-<paragraph role="heading" id="hd_id3152946" xml-lang="en-US" level="2" l10n="U" oldref="18">More</paragraph>
-<paragraph role="paragraph" id="par_id3149802" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SW:MOREBUTTON:DLG_AUTOFMT_TABLE:BTN_MORE">Displays more formatting options for tables. Click again to hide the options.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153534" xml-lang="en-US" level="2" l10n="U" oldref="31">Formatting</paragraph>
-<paragraph role="paragraph" id="par_id3154477" xml-lang="en-US" l10n="U" oldref="32">Select the formatting attributes that you to include in the selected table style.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_AUTOFMT_TABLE:BTN_NUMFORMAT" id="bm_id3147526" localize="false"/>
-<paragraph role="heading" id="hd_id3151317" xml-lang="en-US" level="3" l10n="U" oldref="33">Number format</paragraph>
-<paragraph role="paragraph" id="par_id3150970" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SW:CHECKBOX:DLG_AUTOFMT_TABLE:BTN_NUMFORMAT">Includes numbering formats in the selected table style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_AUTOFMT_TABLE:BTN_FONT" id="bm_id3152954" localize="false"/>
-<paragraph role="heading" id="hd_id3150350" xml-lang="en-US" level="3" l10n="U" oldref="24">Font</paragraph>
-<paragraph role="paragraph" id="par_id3152961" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SW:CHECKBOX:DLG_AUTOFMT_TABLE:BTN_FONT">Includes font formatting in the selected table style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_AUTOFMT_TABLE:BTN_ALIGNMENT" id="bm_id3153675" localize="false"/>
-<paragraph role="heading" id="hd_id3154575" xml-lang="en-US" level="3" l10n="U" oldref="20">Alignment</paragraph>
-<paragraph role="paragraph" id="par_id3155896" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SW:CHECKBOX:DLG_AUTOFMT_TABLE:BTN_ALIGNMENT">Includes alignment settings in the selected table style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_AUTOFMT_TABLE:BTN_BORDER" id="bm_id3154193" localize="false"/>
-<paragraph role="heading" id="hd_id3149690" xml-lang="en-US" level="3" l10n="U" oldref="22">Border</paragraph>
-<paragraph role="paragraph" id="par_id3154200" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SW:CHECKBOX:DLG_AUTOFMT_TABLE:BTN_BORDER">Includes border styles in the selected table style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_AUTOFMT_TABLE:BTN_PATTERN" id="bm_id3155184" localize="false"/>
-<paragraph role="heading" id="hd_id3159201" xml-lang="en-US" level="3" l10n="U" oldref="26">Pattern</paragraph>
-<paragraph role="paragraph" id="par_id3151325" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SW:CHECKBOX:DLG_AUTOFMT_TABLE:BTN_PATTERN">Includes background styles in the selected table style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_AUTOFMT_TABLE:BTN_RENAME" id="bm_id3149483" localize="false"/>
-<paragraph role="heading" id="hd_id3149302" xml-lang="en-US" level="2" l10n="U" oldref="28">Rename</paragraph>
-<paragraph role="paragraph" id="par_id3149490" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SW:PUSHBUTTON:DLG_AUTOFMT_TABLE:BTN_RENAME">Changes the name of the selected table style. You cannot rename the "Standard" table style.</ahelp></paragraph>
-</body>
-</helpdocument>
+ <section id="howtoget">
+ <embed href="text/swriter/00/00000405.xhp#autoformattab"/>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id3151388" role="heading" level="2" l10n="U" oldref="3">Applying an AutoFormat to a Table</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3145828" role="listitem" l10n="U" oldref="4">Click in a table cell, or select the cells that you want to format.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153006" role="listitem" l10n="CHG" oldref="5">Choose <emph>Table - AutoFormat</emph>, and then click the format that you to want to apply.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3145585" role="listitem" l10n="U" oldref="30">Click <emph>OK</emph>.</paragraph>
+ </listitem>
+ </list>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_AUTOFMT_TABLE:LB_FORMAT" id="bm_id3148770" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148386" role="heading" level="2" l10n="U" oldref="8">Format</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149022" role="paragraph" l10n="U" oldref="9"><ahelp hid="SW:LISTBOX:DLG_AUTOFMT_TABLE:LB_FORMAT">Lists the available formatting styles for tables. Click the format that you want to apply, and then click <emph>OK</emph>.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_AUTOFMT_TABLE:BTN_ADD" id="bm_id3147174" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153722" role="heading" level="2" l10n="U"
+ oldref="10">Add</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151185" role="paragraph" l10n="U" oldref="11"><ahelp hid="SW:PUSHBUTTON:DLG_AUTOFMT_TABLE:BTN_ADD">Adds a new table style to the list.</ahelp></paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154646" role="listitem" l10n="U" oldref="12">Format a table in your document.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3156320" role="listitem" l10n="CHG" oldref="13">Select the table, and then choose <emph>Table - AutoFormat</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153156" role="listitem" l10n="U" oldref="14">Click <emph>Add</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3151168" role="listitem" l10n="U" oldref="15">In the <link href="text/shared/01/05150101.xhp" name="Add AutoFormat"><emph>Add AutoFormat</emph></link> dialog, enter a name, and then click <emph>OK</emph>.</paragraph>
+ </listitem>
+ </list>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_AUTOFMT_TABLE:BTN_REMOVE" id="bm_id3154280" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147516" role="heading" level="2" l10n="U"
+ oldref="16">Delete</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150707" role="paragraph" l10n="U" oldref="17"><ahelp hid="SW:PUSHBUTTON:DLG_AUTOFMT_TABLE:BTN_REMOVE">Deletes the selected table style.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:MoreButton:DLG_AUTOFMT_TABLE:BTN_MORE" id="bm_id3154103" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3152946" role="heading" level="2" l10n="U"
+ oldref="18">More</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149802" role="paragraph" l10n="U" oldref="19"><ahelp hid="SW:MOREBUTTON:DLG_AUTOFMT_TABLE:BTN_MORE">Displays more formatting options for tables. Click again to hide the options.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3153534" role="heading" level="2" l10n="U"
+ oldref="31">Formatting</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154477" role="paragraph" l10n="U" oldref="32">Select the formatting attributes that you to include in the selected table style.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_AUTOFMT_TABLE:BTN_NUMFORMAT" id="bm_id3147526" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151317" role="heading" level="3" l10n="U"
+ oldref="33">Number format</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150970" role="paragraph" l10n="U" oldref="34"><ahelp hid="SW:CHECKBOX:DLG_AUTOFMT_TABLE:BTN_NUMFORMAT">Includes numbering formats in the selected table style.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_AUTOFMT_TABLE:BTN_FONT" id="bm_id3152954" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150350" role="heading" level="3" l10n="U"
+ oldref="24">Font</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152961" role="paragraph" l10n="U" oldref="25"><ahelp hid="SW:CHECKBOX:DLG_AUTOFMT_TABLE:BTN_FONT">Includes font formatting in the selected table style.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_AUTOFMT_TABLE:BTN_ALIGNMENT" id="bm_id3153675" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154575" role="heading" level="3" l10n="U"
+ oldref="20">Alignment</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155896" role="paragraph" l10n="U" oldref="21"><ahelp hid="SW:CHECKBOX:DLG_AUTOFMT_TABLE:BTN_ALIGNMENT">Includes alignment settings in the selected table style.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_AUTOFMT_TABLE:BTN_BORDER" id="bm_id3154193" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149690" role="heading" level="3" l10n="U"
+ oldref="22">Border</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154200" role="paragraph" l10n="U" oldref="23"><ahelp hid="SW:CHECKBOX:DLG_AUTOFMT_TABLE:BTN_BORDER">Includes border styles in the selected table style.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_AUTOFMT_TABLE:BTN_PATTERN" id="bm_id3155184" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3159201" role="heading" level="3" l10n="U"
+ oldref="26">Pattern</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151325" role="paragraph" l10n="U" oldref="27"><ahelp hid="SW:CHECKBOX:DLG_AUTOFMT_TABLE:BTN_PATTERN">Includes background styles in the selected table style.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_AUTOFMT_TABLE:BTN_RENAME" id="bm_id3149483" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149302" role="heading" level="2" l10n="U"
+ oldref="28">Rename</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149490" role="paragraph" l10n="U" oldref="29"><ahelp hid="SW:PUSHBUTTON:DLG_AUTOFMT_TABLE:BTN_RENAME">Changes the name of the selected table style. You cannot rename the "Standard" table style.</ahelp></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/01/05150104.xhp b/helpcontent2/source/text/swriter/01/05150104.xhp
index 8d9bcd40da..0573d28dda 100755
--- a/helpcontent2/source/text/swriter/01/05150104.xhp
+++ b/helpcontent2/source/text/swriter/01/05150104.xhp
@@ -41,8 +41,8 @@
</meta>
<body>
<paragraph role="heading" id="hd_id3154502" xml-lang="en-US" level="1" l10n="U" oldref="1">Combine</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:METRICFIELD:RID_OFADLG_PRCNT_SET:ED_RIGHT_MARGIN" id="bm_id3145243" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_MetricField_RID_OFADLG_PRCNT_SET_ED_RIGHT_MARGIN" id="bm_id9093905" localize="false"/>
+<!-- removed HID OFFMGR:METRICFIELD:RID_OFADLG_PRCNT_SET:ED_RIGHT_MARGIN -->
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_OFADLG_PRCNT_SET:ED_RIGHT_MARGIN" id="bm_id9093905" localize="false"/>
<paragraph role="heading" id="hd_id3150020" xml-lang="en-US" level="2" l10n="U" oldref="2">Minimum Size</paragraph>
<paragraph role="paragraph" id="par_id3145241" xml-lang="en-US" l10n="U" oldref="3"><ahelp hid="OFFMGR:METRICFIELD:RID_OFADLG_PRCNT_SET:ED_RIGHT_MARGIN">Enter the minimum length for combining single-lined paragraphs as a percentage of the page width.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/swriter/01/05150200.xhp b/helpcontent2/source/text/swriter/01/05150200.xhp
index 88bc0df928..1d557b5bf3 100644
--- a/helpcontent2/source/text/swriter/01/05150200.xhp
+++ b/helpcontent2/source/text/swriter/01/05150200.xhp
@@ -6,10 +6,13 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
*
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
+ *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,59 +35,60 @@
<meta>
-<topic id="textswriter0105150200xml" indexer="include">
-<title id="tit" xml-lang="en-US">Apply</title>
-<filename>/text/swriter/01/05150200.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="dokument">
+ <topic id="textswriter0105150200xml" indexer="include">
+ <title xml-lang="en-US" id="tit">Apply</title>
+ <filename>/text/swriter/01/05150200.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="dokument">
<bookmark xml-lang="en-US" branch="hid/FN_AUTOFORMAT_APPLY" id="bm_id9349581" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:AutoFormatApply" id="bm_id3154656" localize="false"/>
<bookmark xml-lang="en-US" branch="index" id="bm_id5028839"><bookmark_value>automatic heading formatting</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="index" id="bm_id"><bookmark_value>AutoFormat function;headings</bookmark_value>
-<bookmark_value>headings;automatic</bookmark_value>
-<bookmark_value>separator lines;AutoFormat function</bookmark_value>
-</bookmark>
-<paragraph role="heading" id="hd_id3155962" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05150200.xhp" name="Apply">Apply</link></paragraph>
-<paragraph role="paragraph" id="par_id3149871" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:AutoFormatApply">Automatically formats the file according to the options that you set under <emph>Tools - AutoCorrect</emph>
-<emph> Options</emph>.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/swriter/00/00000405.xhp#autoformat2"/>
-</section>
-<embed href="text/swriter/guide/auto_off.xhp#auto_off"/>
-<paragraph role="paragraph" id="par_id3147404" xml-lang="en-US" l10n="U" oldref="15">When you apply automatic formats, the following rules apply:</paragraph>
-<paragraph role="heading" id="hd_id3155625" xml-lang="en-US" level="2" l10n="U" oldref="3">AutoCorrect for Headings</paragraph>
-<paragraph role="paragraph" id="par_id3154505" xml-lang="en-US" l10n="U" oldref="4">A paragraph is formatted as a heading when the following conditions are met:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3145241" xml-lang="en-US" l10n="U" oldref="19">paragraph begins with a capital letter</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148386" xml-lang="en-US" l10n="U" oldref="20">paragraph does not end with a punctuation mark</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150564" xml-lang="en-US" l10n="U" oldref="21">empty paragraph above and below the paragraph</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3149030" xml-lang="en-US" level="2" l10n="U" oldref="8">AutoCorrect for Bullets / Numbering</paragraph>
-<paragraph role="paragraph" id="par_id3156316" xml-lang="en-US" l10n="U" oldref="9">To create a bulleted list, type a hyphen (-), star (*), or plus sign (+), followed by a space or tab at the beginning of a paragraph.</paragraph>
-<paragraph role="paragraph" id="par_id3150763" xml-lang="en-US" l10n="U" oldref="18">To create a numbered list, type a number followed by a period (.), followed by a space or tab at the beginning of a paragraph. </paragraph>
-<paragraph role="note" id="par_id3147507" xml-lang="en-US" l10n="U" oldref="16">Automatic numbering is only applied to paragraphs formatted with the <emph>Standard</emph>, <emph>Text body</emph> or <emph>Text body indent</emph> paragraph styles.</paragraph>
-<paragraph role="heading" id="hd_id3152941" xml-lang="en-US" level="2" l10n="U" oldref="10">AutoCorrect for Separator Lines</paragraph>
-<paragraph role="paragraph" id="par_id3154105" xml-lang="en-US" l10n="U" oldref="11">If you type three or more hyphens (---), underscores (___) or equal signs (===) on line and then press Enter, the paragraph is replaced by a horizontal line as wide as the page. The line is actually the <link href="text/shared/01/05030500.xhp" name="lower border">lower border</link> of the preceding paragraph. The following rules apply:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153530" xml-lang="en-US" l10n="U" oldref="12">Three hyphens (-) yield a single line (0.05 pt thick, gap 0.75 mm).</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154477" xml-lang="en-US" l10n="U" oldref="13">Three underscore (_) yield a single line (1 pt thick, gap 0.75 mm).</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150982" xml-lang="en-US" l10n="U" oldref="14">Three equal signs (=) yield a double line (1.10 pt thick, gap 0.75 mm).</paragraph>
-</listitem>
-</list>
-</body>
-</helpdocument>
+<bookmark xml-lang="en-US" branch="index" id="bm_id"><bookmark_value>AutoCorrect function;headings</bookmark_value>
+ <bookmark_value>headings;automatic</bookmark_value>
+ <bookmark_value>separator lines;AutoCorrect function</bookmark_value>
+</bookmark><comment>MW replaced AutoFormat by AutoCorrect (2 times)</comment>
+<paragraph xml-lang="en-US" id="hd_id3155962" role="heading" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05150200.xhp" name="Apply">Apply</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149871" role="paragraph" l10n="CHG" oldref="2"><ahelp hid=".uno:AutoFormatApply">Automatically formats the file according to the options that you set under <emph>Tools - AutoCorrect</emph>
+ <emph>Options</emph>.</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/swriter/00/00000405.xhp#autoformat2"/>
+ </section>
+ <embed href="text/swriter/guide/auto_off.xhp#auto_off"/>
+ <paragraph xml-lang="en-US" id="par_id3147404" role="paragraph" l10n="U" oldref="15">When you apply automatic formats, the following rules apply:</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3155625" role="heading" level="2" l10n="U" oldref="3">AutoCorrect for Headings</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154505" role="paragraph" l10n="U" oldref="4">A paragraph is formatted as a heading when the following conditions are met:</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3145241" role="listitem" l10n="U" oldref="19">paragraph begins with a capital letter</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148386" role="listitem" l10n="U" oldref="20">paragraph does not end with a punctuation mark</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150564" role="listitem" l10n="U" oldref="21">empty paragraph above and below the paragraph</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3149030" role="heading" level="2" l10n="U" oldref="8">AutoCorrect for Bullets / Numbering</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156316" role="paragraph" l10n="U" oldref="9">To create a bulleted list, type a hyphen (-), star (*), or plus sign (+), followed by a space or tab at the beginning of a paragraph.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150763" role="paragraph" l10n="U" oldref="18">To create a numbered list, type a number followed by a period (.), followed by a space or tab at the beginning of a paragraph. </paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147507" role="note" l10n="U" oldref="16">Automatic numbering is only applied to paragraphs formatted with the <emph>Standard</emph>, <emph>Text body</emph> or <emph>Text body indent</emph> paragraph styles.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3152941" role="heading" level="2" l10n="U"
+ oldref="10">AutoCorrect for Separator Lines</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154105" role="paragraph" l10n="U" oldref="11">If you type three or more hyphens (---), underscores (___) or equal signs (===) on line and then press Enter, the paragraph is replaced by a horizontal line as wide as the page. The line is actually the <link href="text/shared/01/05030500.xhp" name="lower border">lower border</link> of the preceding paragraph. The following rules apply:</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153530" role="listitem" l10n="U" oldref="12">Three hyphens (-) yield a single line (0.05 pt thick, gap 0.75 mm).</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154477" role="listitem" l10n="U" oldref="13">Three underscore (_) yield a single line (1 pt thick, gap 0.75 mm).</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150982" role="listitem" l10n="U" oldref="14">Three equal signs (=) yield a double line (1.10 pt thick, gap 0.75 mm).</paragraph>
+ </listitem>
+ </list>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/01/05170000.xhp b/helpcontent2/source/text/swriter/01/05170000.xhp
index ad55f72677..17d342483d 100644
--- a/helpcontent2/source/text/swriter/01/05170000.xhp
+++ b/helpcontent2/source/text/swriter/01/05170000.xhp
@@ -48,35 +48,35 @@
<section id="howtoget">
<embed href="text/swriter/00/00000405.xhp#vorlagenladen"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SFX2_LISTBOX_DLG_NEW_FILE_LB_REGION" id="bm_id3154555" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:ListBox:DLG_NEW_FILE:LB_REGION" id="bm_id3154555" localize="false"/>
<paragraph role="heading" id="hd_id3149354" xml-lang="en-US" level="2" l10n="U" oldref="6">Categories</paragraph>
<paragraph role="paragraph" id="par_id3154561" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SFX2_LISTBOX_DLG_NEW_FILE_LB_REGION">Lists the available template categories. Click a category to view its contents in the <emph>Templates </emph>list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_LISTBOX_DLG_NEW_FILE_LB_TEMPLATE" id="bm_id3145242" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:ListBox:DLG_NEW_FILE:LB_TEMPLATE" id="bm_id3145242" localize="false"/>
<paragraph role="heading" id="hd_id3149885" xml-lang="en-US" level="2" l10n="U" oldref="8">Templates</paragraph>
<paragraph role="paragraph" id="par_id3145249" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SFX2_LISTBOX_DLG_NEW_FILE_LB_TEMPLATE">Lists the available templates for the selected category.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_LTEMPL_TEXT" id="bm_id3148768" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SFX2_CHECKBOX_DLG_NEW_FILE_CB_TEXT_STYLE" id="bm_id3148772" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:DLG_NEW_FILE:CB_TEXT_STYLE" id="bm_id3148772" localize="false"/>
<paragraph role="heading" id="hd_id3148392" xml-lang="en-US" level="2" l10n="U" oldref="10">Text</paragraph>
<paragraph role="paragraph" id="par_id3149026" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SFX2_CHECKBOX_DLG_NEW_FILE_CB_TEXT_STYLE">Loads the paragraph and the character styles from the selected document into the current document.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_LTEMPL_FRAME" id="bm_id3147170" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SFX2_CHECKBOX_DLG_NEW_FILE_CB_FRAME_STYLE" id="bm_id3147174" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:DLG_NEW_FILE:CB_FRAME_STYLE" id="bm_id3147174" localize="false"/>
<paragraph role="heading" id="hd_id3153717" xml-lang="en-US" level="2" l10n="U" oldref="12">Frame</paragraph>
<paragraph role="paragraph" id="par_id3156320" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SFX2_CHECKBOX_DLG_NEW_FILE_CB_FRAME_STYLE">Loads the frame styles from the selected document into the current document.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_LTEMPL_PAGE" id="bm_id3151266" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SFX2_CHECKBOX_DLG_NEW_FILE_CB_PAGE_STYLE" id="bm_id3151271" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:DLG_NEW_FILE:CB_PAGE_STYLE" id="bm_id3151271" localize="false"/>
<paragraph role="heading" id="hd_id3147565" xml-lang="en-US" level="2" l10n="U" oldref="14">Page</paragraph>
<paragraph role="paragraph" id="par_id3154642" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SFX2_CHECKBOX_DLG_NEW_FILE_CB_PAGE_STYLE">Loads the page styles from the selected document into the current document.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_LTEMPL_NUMBERING" id="bm_id3149752" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SFX2_CHECKBOX_DLG_NEW_FILE_CB_NUM_STYLE" id="bm_id3149756" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:DLG_NEW_FILE:CB_NUM_STYLE" id="bm_id3149756" localize="false"/>
<paragraph role="heading" id="hd_id3153147" xml-lang="en-US" level="2" l10n="U" oldref="18">Numbering</paragraph>
<paragraph role="paragraph" id="par_id3152587" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SFX2_CHECKBOX_DLG_NEW_FILE_CB_NUM_STYLE">Loads the numbering styles from the selected document into the current document.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_LTEMPL_OVERRIDE" id="bm_id3145419" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SFX2_CHECKBOX_DLG_NEW_FILE_CB_MERGE_STYLE" id="bm_id3147507" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:DLG_NEW_FILE:CB_MERGE_STYLE" id="bm_id3147507" localize="false"/>
<paragraph role="heading" id="hd_id3151176" xml-lang="en-US" level="2" l10n="U" oldref="16">Overwrite</paragraph>
<paragraph role="paragraph" id="par_id3147514" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SFX2_CHECKBOX_DLG_NEW_FILE_CB_MERGE_STYLE">Replaces styles in the current document that have the same name as the styles you are loading.</ahelp></paragraph>
<paragraph role="warning" id="par_id3150358" xml-lang="en-US" l10n="U" oldref="20">Styles with identical names are automatically overwritten.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_PUSHBUTTON_DLG_NEW_FILE_PB_LOAD_FILE" id="bm_id3147520" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:DLG_NEW_FILE:PB_LOAD_FILE" id="bm_id3147520" localize="false"/>
<paragraph role="heading" id="hd_id3153668" xml-lang="en-US" level="2" l10n="U" oldref="21">From file</paragraph>
<paragraph role="paragraph" id="par_id3147526" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SFX2_PUSHBUTTON_DLG_NEW_FILE_PB_LOAD_FILE">Locate the file containing the styles that you want to load, and then click <emph>Open</emph>.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/swriter/01/05190000.xhp b/helpcontent2/source/text/swriter/01/05190000.xhp
index 0e79fa4389..cd19db9623 100644
--- a/helpcontent2/source/text/swriter/01/05190000.xhp
+++ b/helpcontent2/source/text/swriter/01/05190000.xhp
@@ -47,7 +47,7 @@
</bookmark>
<bookmark xml-lang="en-US" branch="hid/FN_TABLE_SPLIT_TABLE" id="bm_id3037041" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:SplitTable" id="bm_id3154654" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/20642" id="bm_id7706534" localize="false"/>
+<!-- removed HID 20642 -->
<paragraph role="heading" id="hd_id3153246" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05190000.xhp" name="Split Table">Split Table</link></paragraph>
<paragraph role="paragraph" id="par_id3083450" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:SplitTable">Splits the current table into two separate tables at the cursor position.</ahelp> You can also access this command by right-clicking in a table cell.</paragraph>
</section>
@@ -55,16 +55,16 @@
<embed href="text/swriter/00/00000405.xhp#tabauf"/>
</section>
<paragraph role="heading" id="hd_id3149351" xml-lang="en-US" level="2" l10n="U" oldref="3">Mode</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_SPLIT_TABLE:RB_CNTNT" id="bm_id3153002" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_SPLIT_TABLE:RB_CNTNT" id="bm_id3153002" localize="false"/>
<paragraph role="heading" id="hd_id3154554" xml-lang="en-US" level="3" l10n="U" oldref="5">Copy heading</paragraph>
<paragraph role="paragraph" id="par_id3154503" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:RADIOBUTTON:DLG_SPLIT_TABLE:RB_CNTNT">Includes the first row of the original table as the first row of the second table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_SPLIT_TABLE:RB_BOX_PARA" id="bm_id3145247" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_SPLIT_TABLE:RB_BOX_PARA" id="bm_id3145247" localize="false"/>
<paragraph role="heading" id="hd_id3149880" xml-lang="en-US" level="3" l10n="U" oldref="7">Custom heading (apply style)</paragraph>
<paragraph role="paragraph" id="par_id3148389" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:RADIOBUTTON:DLG_SPLIT_TABLE:RB_BOX_PARA">Inserts a blank header row in the second table that is formatted with the style of the first row in the original table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_SPLIT_TABLE:RB_BOX_NOPARA" id="bm_id3148775" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_SPLIT_TABLE:RB_BOX_NOPARA" id="bm_id3148775" localize="false"/>
<paragraph role="heading" id="hd_id3150568" xml-lang="en-US" level="3" l10n="U" oldref="9">Custom heading</paragraph>
<paragraph role="paragraph" id="par_id3149027" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:RADIOBUTTON:DLG_SPLIT_TABLE:RB_BOX_NOPARA">Inserts an additional blank row in the second table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_SPLIT_TABLE:RB_BORDER" id="bm_id3147173" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_SPLIT_TABLE:RB_BORDER" id="bm_id3147173" localize="false"/>
<paragraph role="heading" id="hd_id3153720" xml-lang="en-US" level="3" l10n="U" oldref="11">No heading</paragraph>
<paragraph role="paragraph" id="par_id3156318" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:RADIOBUTTON:DLG_SPLIT_TABLE:RB_BORDER">Splits the table without copying the header row.</ahelp></paragraph>
<paragraph role="warning" id="par_id3145411" xml-lang="en-US" l10n="U" oldref="13">When you split a table that contains formulas, the formulas may be affected.</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/05200000.xhp b/helpcontent2/source/text/swriter/01/05200000.xhp
index 96c530ab8a..f85d30eefb 100644
--- a/helpcontent2/source/text/swriter/01/05200000.xhp
+++ b/helpcontent2/source/text/swriter/01/05200000.xhp
@@ -46,7 +46,7 @@
</bookmark>
<bookmark xml-lang="en-US" branch="hid/FN_TABLE_MERGE_TABLE" id="bm_id6690819" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:MergeTable" id="bm_id3149048" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/20652" id="bm_id4696798" localize="false"/>
+<!-- removed HID 20652 -->
<paragraph role="heading" id="hd_id3154652" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/swriter/01/05200000.xhp" name="Merge Table">Merge Table</link></paragraph>
<paragraph role="paragraph" id="par_id3147401" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:MergeTable">Combines two consecutive tables into a single table. The tables must be directly next to each other and not separated by an empty paragraph.</ahelp></paragraph>
</section>
diff --git a/helpcontent2/source/text/swriter/01/06030000.xhp b/helpcontent2/source/text/swriter/01/06030000.xhp
index b2378d3e23..de2956c2e6 100644
--- a/helpcontent2/source/text/swriter/01/06030000.xhp
+++ b/helpcontent2/source/text/swriter/01/06030000.xhp
@@ -72,20 +72,20 @@
</caseinline><defaultinline>+Ctrl </defaultinline></switchinline>+Minus sign(-).</paragraph>
<paragraph role="paragraph" id="par_id3154573" xml-lang="en-US" l10n="U" oldref="33">To hide custom hyphens, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040600.xhp" name="Text Document - Formatting Aids">%PRODUCTNAME Writer - Formatting Aids</link></emph>, and then clear the <emph>Custom hyphens</emph> check box.</paragraph>
<paragraph role="heading" id="hd_id3150360" xml-lang="en-US" level="2" l10n="U" oldref="20">Word</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXDLG_HYPHENATE:ED_WORD" id="bm_id3155903" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_HYPHENATE:ED_WORD" id="bm_id3155903" localize="false"/>
<paragraph role="heading" id="hd_id3153676" xml-lang="en-US" level="3" l10n="U" oldref="21">Word</paragraph>
<paragraph role="paragraph" id="par_id3149687" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX:EDIT:RID_SVXDLG_HYPHENATE:ED_WORD">Displays the hyphenation suggestion(s) for the selected word.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXDLG_HYPHENATE:BTN_LEFT" id="bm_id3159192" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXDLG_HYPHENATE:BTN_RIGHT" id="bm_id3159196" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXDLG_HYPHENATE:BTN_LEFT" id="bm_id3159192" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXDLG_HYPHENATE:BTN_RIGHT" id="bm_id3159196" localize="false"/>
<paragraph role="heading" id="hd_id3154195" xml-lang="en-US" level="3" l10n="U" oldref="23">Left / Right Arrow</paragraph>
<paragraph role="paragraph" id="par_id3155174" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXDLG_HYPHENATE:BTN_RIGHT">Set the position of the hyphen. This option is only available if more than one hyphenation suggestion is displayed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_HYPHENATE:BTN_HYPH_CONTINUE" id="bm_id3149299" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_CONTINUE" id="bm_id3149299" localize="false"/>
<paragraph role="heading" id="hd_id3151327" xml-lang="en-US" level="2" l10n="U" oldref="25">Next</paragraph>
<paragraph role="paragraph" id="par_id3149306" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_HYPHENATE:BTN_HYPH_CONTINUE">Ignores the hyphenation suggestion and finds the next word to hyphenate.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_HYPHENATE" id="bm_id3143280" localize="false"/>
<paragraph role="heading" id="hd_id3149495" xml-lang="en-US" level="2" l10n="U" oldref="27">Hyphenate</paragraph>
<paragraph role="paragraph" id="par_id3149096" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="HID_HYPHENATE">Inserts the hyphen at the indicated position.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_HYPHENATE:BTN_HYPH_DELETE" id="bm_id3149815" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_DELETE" id="bm_id3149815" localize="false"/>
<paragraph role="heading" id="hd_id3154829" xml-lang="en-US" level="2" l10n="U" oldref="29">Remove</paragraph>
<paragraph role="paragraph" id="par_id3149821" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_HYPHENATE:BTN_HYPH_DELETE">Rejects the hyphenation suggestion.</ahelp></paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/helpcontent2/source/text/swriter/01/06040000.xhp b/helpcontent2/source/text/swriter/01/06040000.xhp
index 82d7f207f9..0c7d2355b8 100755
--- a/helpcontent2/source/text/swriter/01/06040000.xhp
+++ b/helpcontent2/source/text/swriter/01/06040000.xhp
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
-
-<!--***********************************************************************
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -26,32 +27,30 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-<helpdocument version="1.0">
+ ************************************************************************
+ -->
+
+
<meta>
-<topic id="textswriter0106040000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Word Count</title>
-<filename>/text/swriter/01/06040000.xhp</filename>
-</topic>
-<history>
-<created date="2004-05-24T16:24:52">UFI: new Writer menu entry Word Count</created>
-<lastedited date="2004-12-16T13:06:22">yj: checked</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textswriter0106040000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Word Count</title>
+ <filename>/text/swriter/01/06040000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="hid/FN_WORDCOUNT_DIALOG" id="bm_id3698232" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_DLG_WORDCOUNT" id="bm_id6469313" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:WordCountDialog" id="bm_id1483504" localize="false"/>
<section id="wordcount">
-<paragraph role="heading" id="par_idN10542" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/06040000.xhp">Word Count</link></paragraph>
-<paragraph role="paragraph" id="par_idN10552" xml-lang="en-US" l10n="NEW"><ahelp hid="FN_WORDCOUNT_DIALOG">Counts the words and characters in the current selection and in the whole document.</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/swriter/00/00000406.xhp#wordcount"/>
-</section>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_idN1062D" xml-lang="en-US" l10n="NEW"><link href="text/shared/01/01100400.xhp">Statistics</link></paragraph>
-</section>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_idN10542" role="heading" level="1" l10n="NEW"><link href="text/swriter/01/06040000.xhp">Word Count</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10552" role="paragraph" l10n="NEW"><ahelp hid="FN_WORDCOUNT_DIALOG">Counts the words and characters in the current selection and in the whole document.</ahelp></paragraph>
+ <embed href="text/swriter/guide/words_count.xhp#how"/>
+ </section>
+ <section id="howtoget">
+ <embed href="text/swriter/00/00000406.xhp#wordcount"/>
+ </section>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_idN1062D" role="paragraph" l10n="CHG"><link href="text/shared/01/01100400.xhp" name="File - Properties - Statistics">File - Properties - Statistics</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/01/06060000.xhp b/helpcontent2/source/text/swriter/01/06060000.xhp
index e60a059d3c..14dd7e8aef 100644
--- a/helpcontent2/source/text/swriter/01/06060000.xhp
+++ b/helpcontent2/source/text/swriter/01/06060000.xhp
@@ -60,8 +60,8 @@
<paragraph role="paragraph" id="par_id3150350" xml-lang="en-US" l10n="U" oldref="60"><ahelp hid="HID_NUM_OUTL_NAMED_NUMS">Select the predefined numbering style that you want to assign to the selected outline level.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_NUM_OUTL_NUM_SAVEAS" id="bm_id3152958" localize="false"/><paragraph role="heading" id="hd_id3153675" xml-lang="en-US" level="3" l10n="U" oldref="61">Save As</paragraph>
<paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="62"><ahelp hid="HID_NUM_OUTL_NUM_SAVEAS">Opens a dialog where you can save the current settings for the selected outline level. You can then load these settings from another document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_NUM_NAMES:ED_FORM" id="bm_id3154191" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:DLG_NUM_NAMES:LB_FORM" id="bm_id3154194" localize="false"/><paragraph role="heading" id="hd_id3149689" xml-lang="en-US" level="3" l10n="U" oldref="63">Save As</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_NUM_NAMES:ED_FORM" id="bm_id3154191" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_NUM_NAMES:LB_FORM" id="bm_id3154194" localize="false"/><paragraph role="heading" id="hd_id3149689" xml-lang="en-US" level="3" l10n="U" oldref="63">Save As</paragraph>
<paragraph role="paragraph" id="par_id3154200" xml-lang="en-US" l10n="U" oldref="64"><ahelp hid="SW:LISTBOX:DLG_NUM_NAMES:LB_FORM">Click a numbering style in the list, and then enter a name for the style. The numbers correspond to the outline level that the styles are assigned to.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/06060100.xhp b/helpcontent2/source/text/swriter/01/06060100.xhp
index 7bf6b2889f..9ed374e9d6 100755
--- a/helpcontent2/source/text/swriter/01/06060100.xhp
+++ b/helpcontent2/source/text/swriter/01/06060100.xhp
@@ -47,15 +47,15 @@
<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/sw:ListBox:TP_OUTLINE_NUM:LB_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="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/sw:ListBox:TP_OUTLINE_NUM:LB_COLL" 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"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_OUTLINE_NUM:LB_NUMBER" 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>
<table id="tbl_id3154642">
@@ -137,19 +137,19 @@
</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/sw:ListBox:TP_OUTLINE_NUM:LB_CHARFMT" 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"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_OUTLINE_NUM:NF_ALL_LEVEL" 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"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_OUTLINE_NUM:ED_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"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_OUTLINE_NUM:ED_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"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_OUTLINE_NUM:ED_START" 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>
</body>
diff --git a/helpcontent2/source/text/swriter/01/06080100.xhp b/helpcontent2/source/text/swriter/01/06080100.xhp
index 787cf3555d..5b0dbc20d9 100644
--- a/helpcontent2/source/text/swriter/01/06080100.xhp
+++ b/helpcontent2/source/text/swriter/01/06080100.xhp
@@ -50,7 +50,7 @@
</section>
<paragraph role="note" id="par_id3154560" xml-lang="en-US" l10n="U" oldref="47">To set additional option for footnotes and endnotes, choose <emph>Format - Page</emph>, and then click the <link href="text/swriter/01/05040600.xhp" name="Footnote"><emph>Footnote</emph></link> tab.</paragraph>
<paragraph role="heading" id="hd_id3149884" xml-lang="en-US" level="2" l10n="U" oldref="9">AutoNumbering</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FOOTNOTEOPTION:LB_NUMVIEW" id="bm_id3150929" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FOOTNOTEOPTION:LB_NUMVIEW" id="bm_id3150929" localize="false"/>
<paragraph role="heading" id="hd_id3148394" xml-lang="en-US" level="3" l10n="U" oldref="11">Numbering</paragraph>
<section id="endnotennumerierung">
<paragraph role="paragraph" id="par_id3150568" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:LISTBOX:TP_FOOTNOTEOPTION:LB_NUMVIEW">Select the numbering style that you want to use for footnotes or endnotes.</ahelp></paragraph>
@@ -122,7 +122,7 @@
</table>
</section>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FOOTNOTEOPTION:LB_NUMCOUNT" id="bm_id3155179" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FOOTNOTEOPTION:LB_NUMCOUNT" id="bm_id3155179" localize="false"/>
<paragraph role="heading" id="hd_id3151330" xml-lang="en-US" level="3" l10n="U" oldref="25">Counting</paragraph>
<paragraph role="paragraph" id="par_id3155186" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SW:LISTBOX:TP_FOOTNOTEOPTION:LB_NUMCOUNT">Select the numbering option for the footnotes.</ahelp></paragraph>
<table id="tbl_id3143284">
@@ -160,44 +160,44 @@
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_FOOTNOTEOPTION:FLD_OFFSET" id="bm_id3149179" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_FOOTNOTEOPTION:FLD_OFFSET" id="bm_id3149179" localize="false"/>
<paragraph role="heading" id="hd_id3149167" xml-lang="en-US" level="3" l10n="U" oldref="33">Start at</paragraph>
<paragraph role="paragraph" id="par_id3156268" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SW:NUMERICFIELD:TP_FOOTNOTEOPTION:FLD_OFFSET">Enter the number for the first footnote in the document. This option is only available if you selected "Per Document" in the <emph>Counting </emph>box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FOOTNOTEOPTION:ED_PREFIX" id="bm_id3150580" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FOOTNOTEOPTION:ED_PREFIX" id="bm_id3150580" localize="false"/>
<paragraph role="heading" id="hd_id3151036" xml-lang="en-US" level="3" l10n="U" oldref="50">Before</paragraph>
<paragraph role="paragraph" id="par_id3150587" xml-lang="en-US" l10n="U" oldref="51"><ahelp hid="SW:EDIT:TP_FOOTNOTEOPTION:ED_PREFIX">Enter the text that you want to display in front of the footnote number in the note text.</ahelp> For example, type "To " to display "To 1".</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FOOTNOTEOPTION:ED_SUFFIX" id="bm_id3156375" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FOOTNOTEOPTION:ED_SUFFIX" id="bm_id3156375" localize="false"/>
<paragraph role="heading" id="hd_id3156364" xml-lang="en-US" level="3" l10n="U" oldref="52">After</paragraph>
<paragraph role="paragraph" id="par_id3155906" xml-lang="en-US" l10n="U" oldref="53"><ahelp hid="SW:EDIT:TP_FOOTNOTEOPTION:ED_SUFFIX">Enter the text that you want to display after the footnote number in the note text.</ahelp> For example, type ")" to display "1)".</paragraph>
<paragraph role="heading" id="hd_id3148875" xml-lang="en-US" level="3" l10n="U" oldref="3">Position</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_FOOTNOTEOPTION:RB_POS_PAGE" id="bm_id3151380" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FOOTNOTEOPTION:RB_POS_PAGE" id="bm_id3151380" localize="false"/>
<paragraph role="heading" id="hd_id3148888" xml-lang="en-US" level="3" l10n="U" oldref="5">End of page</paragraph>
<paragraph role="paragraph" id="par_id3151385" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:RADIOBUTTON:TP_FOOTNOTEOPTION:RB_POS_PAGE">Displays footnotes at the bottom of the page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_FOOTNOTEOPTION:RB_POS_CHAPTER" id="bm_id3150117" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FOOTNOTEOPTION:RB_POS_CHAPTER" id="bm_id3150117" localize="false"/>
<paragraph role="heading" id="hd_id3149549" xml-lang="en-US" level="3" l10n="U" oldref="7">End of document</paragraph>
<paragraph role="paragraph" id="par_id3150123" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:RADIOBUTTON:TP_FOOTNOTEOPTION:RB_POS_CHAPTER">Displays footnotes at the end of the document as endnotes.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3155871" xml-lang="en-US" level="2" l10n="U" oldref="35">Styles</paragraph>
<paragraph role="paragraph" id="par_id3150695" xml-lang="en-US" l10n="U" oldref="36">To ensure a uniform appearance for the footnotes in your document, assign a paragraph style to the footnotes.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FOOTNOTEOPTION:LB_PARA_TEMPL" id="bm_id3147613" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FOOTNOTEOPTION:LB_PARA_TEMPL" id="bm_id3147613" localize="false"/>
<paragraph role="heading" id="hd_id3147418" xml-lang="en-US" level="3" l10n="U" oldref="37">Paragraph</paragraph>
<paragraph role="paragraph" id="par_id3147620" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="SW:LISTBOX:TP_FOOTNOTEOPTION:LB_PARA_TEMPL">Select the paragraph style for the footnote text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FOOTNOTEOPTION:LB_PAGE_TEMPL" id="bm_id3145122" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FOOTNOTEOPTION:LB_PAGE_TEMPL" id="bm_id3145122" localize="false"/>
<paragraph role="heading" id="hd_id3147495" xml-lang="en-US" level="3" l10n="U" oldref="39">Page</paragraph>
<paragraph role="paragraph" id="par_id3145128" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid="SW:LISTBOX:TP_FOOTNOTEOPTION:LB_PAGE_TEMPL">Select the page style that you want to use for footnotes.</ahelp></paragraph>
<paragraph role="note" id="par_id3149229" xml-lang="en-US" l10n="U" oldref="49">This option is only available if the <emph>End of Document</emph> check box is selected in the <emph>Position</emph> area.</paragraph>
<paragraph role="heading" id="hd_id3147742" xml-lang="en-US" level="2" l10n="U" oldref="61">Character Styles</paragraph>
<paragraph role="paragraph" id="par_id3146335" xml-lang="en-US" l10n="U" oldref="62">You can assign styles to footnote anchors and text. You can use the predefined footnote styles, or use a different style.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FOOTNOTEOPTION:LB_ANCHR_CHARFMT" id="bm_id3149846" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FOOTNOTEOPTION:LB_ANCHR_CHARFMT" id="bm_id3149846" localize="false"/>
<paragraph role="heading" id="hd_id3149834" xml-lang="en-US" level="3" l10n="U" oldref="63">Text area</paragraph>
<paragraph role="paragraph" id="par_id3147592" xml-lang="en-US" l10n="U" oldref="64"><ahelp hid="SW:LISTBOX:TP_FOOTNOTEOPTION:LB_ANCHR_CHARFMT">Select the character style that you want to use for footnote anchors in the text area of your document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FOOTNOTEOPTION_LB_TEXT_CHARFMT" id="bm_id3148857" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FOOTNOTEOPTION:LB_TEXT_CHARFMT" id="bm_id3148857" localize="false"/>
<paragraph role="heading" id="hd_id3148845" xml-lang="en-US" level="3" l10n="U" oldref="55">Footnote area</paragraph>
<paragraph role="paragraph" id="par_id3148863" xml-lang="en-US" l10n="U" oldref="56"><ahelp hid="SW_LISTBOX_TP_FOOTNOTEOPTION_LB_TEXT_CHARFMT">Select the character style that you want to use for the footnote numbers in the footnote area.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3155575" xml-lang="en-US" level="2" l10n="U" oldref="41">Continuation notice</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FOOTNOTEOPTION:ED_CONT" id="bm_id3151078" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FOOTNOTEOPTION:ED_CONT" id="bm_id3151078" localize="false"/>
<paragraph role="heading" id="hd_id3148445" xml-lang="en-US" level="3" l10n="U" oldref="43">End of Footnote</paragraph>
<paragraph role="paragraph" id="par_id3151091" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="SW:EDIT:TP_FOOTNOTEOPTION:ED_CONT">Enter the text that you want to display when the footnotes are continued on the next page, for example, "Continued on Page ". $[officename] Writer automatically inserts the number of the following page. </ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FOOTNOTEOPTION:ED_CONT_FROM" id="bm_id3154082" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FOOTNOTEOPTION:ED_CONT_FROM" id="bm_id3154082" localize="false"/>
<paragraph role="heading" id="hd_id3154784" xml-lang="en-US" level="3" l10n="U" oldref="45">Start of next page</paragraph>
<paragraph role="paragraph" id="par_id3154089" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid="SW:EDIT:TP_FOOTNOTEOPTION:ED_CONT_FROM">Enter the text that you want to display on the page where the footnotes are continued, for example, "Continued from Page ". $[officename] Writer automatically inserts the number of the previous page.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/swriter/01/06080200.xhp b/helpcontent2/source/text/swriter/01/06080200.xhp
index f501bf5ff8..13aabd2a8e 100755
--- a/helpcontent2/source/text/swriter/01/06080200.xhp
+++ b/helpcontent2/source/text/swriter/01/06080200.xhp
@@ -48,32 +48,32 @@
<section id="howtoget">
<embed href="text/swriter/00/00000406.xhp#endnoten"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_ENDNOTEOPTION:LB_NUMVIEW" id="bm_id3149757" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_ENDNOTEOPTION:LB_NUMVIEW" id="bm_id3149757" localize="false"/>
<paragraph role="heading" id="hd_id3149292" xml-lang="en-US" level="2" l10n="U" oldref="3">AutoNumbering</paragraph>
<embed href="text/swriter/01/06080100.xhp#endnotennumerierung"/>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_ENDNOTEOPTION:FLD_OFFSET" id="bm_id3145421" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_ENDNOTEOPTION:FLD_OFFSET" id="bm_id3145421" localize="false"/>
<paragraph role="heading" id="hd_id3151178" xml-lang="en-US" level="3" l10n="U" oldref="4">Start at</paragraph>
<paragraph role="paragraph" id="par_id3147512" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SW:NUMERICFIELD:TP_ENDNOTEOPTION:FLD_OFFSET">Enter the number for the first endnote in the document.</ahelp> This is useful if want the endnote numbering to span more than one document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_ENDNOTEOPTION:ED_PREFIX" id="bm_id3150714" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_ENDNOTEOPTION:ED_PREFIX" id="bm_id3150714" localize="false"/>
<paragraph role="heading" id="hd_id3150702" xml-lang="en-US" level="3" l10n="U" oldref="13">Before</paragraph>
<paragraph role="paragraph" id="par_id3152943" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW:EDIT:TP_ENDNOTEOPTION:ED_PREFIX">Enter the text that you want to display in front of the endnote number in the note text.</ahelp> For example, type "re: " to display "re: 1".</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_ENDNOTEOPTION:ED_SUFFIX" id="bm_id3153529" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_ENDNOTEOPTION:ED_SUFFIX" id="bm_id3153529" localize="false"/>
<paragraph role="heading" id="hd_id3149804" xml-lang="en-US" level="3" l10n="U" oldref="15">After</paragraph>
<paragraph role="paragraph" id="par_id3153535" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW:EDIT:TP_ENDNOTEOPTION:ED_SUFFIX">Enter the text that you want to display after the endnote number in the note text.</ahelp> For example, type ")" to display "1)".</paragraph>
<paragraph role="heading" id="hd_id3152952" xml-lang="en-US" level="2" l10n="U" oldref="6">Styles</paragraph>
<paragraph role="paragraph" id="par_id3150970" xml-lang="en-US" l10n="U" oldref="7">To ensure a uniform appearance for the endnotes in your document, assign a paragraph style to the footnotes.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_ENDNOTEOPTION:LB_PARA_TEMPL" id="bm_id3147520" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_ENDNOTEOPTION:LB_PARA_TEMPL" id="bm_id3147520" localize="false"/>
<paragraph role="heading" id="hd_id3151312" xml-lang="en-US" level="3" l10n="U" oldref="8">Paragraph</paragraph>
<paragraph role="paragraph" id="par_id3147526" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SW:LISTBOX:TP_ENDNOTEOPTION:LB_PARA_TEMPL">Select the paragraph style for the endnote text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_ENDNOTEOPTION:LB_PAGE_TEMPL" id="bm_id3154482" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_ENDNOTEOPTION:LB_PAGE_TEMPL" id="bm_id3154482" localize="false"/>
<paragraph role="heading" id="hd_id3154470" xml-lang="en-US" level="3" l10n="U" oldref="11">Page</paragraph>
<paragraph role="paragraph" id="par_id3154569" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:LISTBOX:TP_ENDNOTEOPTION:LB_PAGE_TEMPL">Select the page style that you want to use for endnotes.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3155901" xml-lang="en-US" level="2" l10n="U" oldref="20">Character Styles</paragraph>
<paragraph role="paragraph" id="par_id3149692" xml-lang="en-US" l10n="U" oldref="21">You can assign styles to endnote anchors and text. You can use the predefined endnote styles, or use a different style.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_ENDNOTEOPTION:LB_ANCHR_CHARFMT" id="bm_id3159195" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_ENDNOTEOPTION:LB_ANCHR_CHARFMT" id="bm_id3159195" localize="false"/>
<paragraph role="heading" id="hd_id3154198" xml-lang="en-US" level="3" l10n="U" oldref="22">Text area</paragraph>
<paragraph role="paragraph" id="par_id3159200" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SW:LISTBOX:TP_ENDNOTEOPTION:LB_ANCHR_CHARFMT">Select the character style that you want to use for endnote anchors in the text area of your document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_ENDNOTEOPTION_LB_TEXT_CHARFMT" id="bm_id3155175" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_ENDNOTEOPTION:LB_TEXT_CHARFMT" id="bm_id3155175" localize="false"/>
<paragraph role="heading" id="hd_id3151326" xml-lang="en-US" level="3" l10n="U" oldref="18">Endnote area</paragraph>
<paragraph role="paragraph" id="par_id3155182" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SW_LISTBOX_TP_ENDNOTEOPTION_LB_TEXT_CHARFMT">Select the character style that you want to use for the endnote numbers in the endnote area.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/swriter/01/06090000.xhp b/helpcontent2/source/text/swriter/01/06090000.xhp
index 9310cc8f8b..5cbefea005 100644
--- a/helpcontent2/source/text/swriter/01/06090000.xhp
+++ b/helpcontent2/source/text/swriter/01/06090000.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textswriter0106090000xml" indexer="include">
<title id="tit" xml-lang="en-US">Convert Text to Table</title>
@@ -53,41 +53,43 @@
<paragraph role="paragraph" id="par_id3150015" xml-lang="en-US" l10n="U" oldref="15">The options available in this dialog depending on the type of conversion.</paragraph>
<paragraph role="heading" id="hd_id3145247" xml-lang="en-US" level="2" l10n="CHG" oldref="3">Separate text at</paragraph>
<paragraph role="paragraph" id="par_id3148388" xml-lang="en-US" l10n="U" oldref="4">A separator, such as a tab, marks the column boundaries in the selected text. Each paragraph in the selection is converted into a row in the table. Similarly, when you convert a table into text, the column markers are changed to the character that you specify, and each row is converted into a separate paragraph.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_CONV_TEXT_TABLE:CB_TAB" id="bm_id3166468" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_CONV_TEXT_TABLE:CB_TAB" id="bm_id3166468" localize="false"/>
<paragraph role="heading" id="hd_id3150936" xml-lang="en-US" level="3" l10n="U" oldref="6">Tabs</paragraph>
<paragraph role="paragraph" id="par_id3149027" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SW:RADIOBUTTON:DLG_CONV_TEXT_TABLE:CB_TAB">Converts the text to a table using tabs as column markers.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_CONV_TEXT_TABLE:CB_SEMI" id="bm_id3153722" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_CONV_TEXT_TABLE:CB_SEMI" id="bm_id3153722" localize="false"/>
<paragraph role="heading" id="hd_id3147171" xml-lang="en-US" level="3" l10n="U" oldref="10">Semicolons</paragraph>
<paragraph role="paragraph" id="par_id3147565" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SW:RADIOBUTTON:DLG_CONV_TEXT_TABLE:CB_SEMI">Converts the text to a table using semi-colons (;) as column markers.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_CONV_TEXT_TABLE:CB_PARA" id="bm_id3154638" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_CONV_TEXT_TABLE:CB_PARA" id="bm_id3154638" localize="false"/>
<paragraph role="heading" id="hd_id3151273" xml-lang="en-US" level="3" l10n="U" oldref="12">Paragraph</paragraph>
<paragraph role="paragraph" id="par_id3154645" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SW:RADIOBUTTON:DLG_CONV_TEXT_TABLE:CB_PARA">Converts the text to a table using paragraphs as column markers.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_CONV_TEXT_TABLE:RB_OTHER" id="bm_id3153151" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_CONV_TEXT_TABLE:RB_OTHER" id="bm_id3153151" localize="false"/>
<paragraph role="heading" id="hd_id3151184" xml-lang="en-US" level="3" l10n="U" oldref="16">Other:</paragraph>
<paragraph role="paragraph" id="par_id3150256" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SW:RADIOBUTTON:DLG_CONV_TEXT_TABLE:RB_OTHER">Converts the text to a table using the character that you type in the box as a column marker.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_CONV_TEXT_TABLE:ED_OTHER" id="bm_id3151168" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_CONV_TEXT_TABLE:ED_OTHER" id="bm_id3151168" localize="false"/>
<paragraph role="heading" id="hd_id3149295" xml-lang="en-US" level="3" l10n="U" oldref="20">Text box</paragraph>
<paragraph role="paragraph" id="par_id3151175" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SW:EDIT:DLG_CONV_TEXT_TABLE:ED_OTHER">Type the character that you want to use as a column marker.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_CONV_TEXT_TABLE:CB_KEEPCOLUMN" id="bm_id3154273" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_KEEPCOLUMN" id="bm_id3154273" localize="false"/>
<paragraph role="heading" id="hd_id3147508" xml-lang="en-US" level="3" l10n="CHG" oldref="18">Equal width for all columns</paragraph>
<paragraph role="paragraph" id="par_id3154278" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SW:CHECKBOX:DLG_CONV_TEXT_TABLE:CB_KEEPCOLUMN">Creates columns of equal width, regardless of the position of the column marker.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_CONV_TEXT_TABLE:BT_AUTOFORMAT" id="bm_id3152939" localize="false"/>
-<paragraph role="heading" id="hd_id3150703" xml-lang="en-US" level="2" l10n="U" oldref="14">AutoCorrect</paragraph>
-<embed href="text/swriter/01/04150000.xhp#autoformattext"/>
+
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_CONV_TEXT_TABLE:BT_AUTOFORMAT" id="bm_id3152939" localize="false"/>
+<paragraph role="heading" id="hd_id3150703" xml-lang="en-US" level="2" l10n="CHG" oldref="14">AutoFormat</paragraph>
+<paragraph role="paragraph" id="par_id31542781" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid=".">Opens the <emph>AutoFormat</emph> dialog, where you can select a predefined layout for table.</ahelp></paragraph>
+
<paragraph role="heading" id="hd_id3154097" xml-lang="en-US" level="2" l10n="U" oldref="22">Options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_CONV_TEXT_TABLE:CB_HEADER" id="bm_id3153528" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_HEADER" id="bm_id3153528" localize="false"/>
<paragraph role="heading" id="hd_id3149802" xml-lang="en-US" level="3" l10n="U" oldref="23">Heading</paragraph>
<paragraph role="paragraph" id="par_id3153535" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SW:CHECKBOX:DLG_CONV_TEXT_TABLE:CB_HEADER">Formats the first row of the new table as a heading.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_CONV_TEXT_TABLE:CB_REPEAT_HEADER" id="bm_id3152962" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_REPEAT_HEADER" id="bm_id3152962" localize="false"/>
<paragraph role="heading" id="hd_id3150359" xml-lang="en-US" level="3" l10n="CHG" oldref="24">Repeat heading</paragraph>
<paragraph role="paragraph" id="par_id3150973" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SW:CHECKBOX:DLG_CONV_TEXT_TABLE:CB_REPEAT_HEADER">Repeats the table header on each page that the table spans.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_NumericField_DLG_CONV_TEXT_TABLE_NF_REPEAT_HEADER" id="bm_id6823328" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_CONV_TEXT_TABLE:NF_REPEAT_HEADER" id="bm_id6823328" localize="false"/>
<paragraph role="heading" id="hd_id5971251" xml-lang="en-US" level="3" l10n="NEW">The first ... rows</paragraph>
<paragraph role="paragraph" id="par_id4136478" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Repeats the first n rows as a header.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_CONV_TEXT_TABLE:CB_DONT_SPLIT" id="bm_id3147524" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_DONT_SPLIT" id="bm_id3147524" localize="false"/>
<paragraph role="heading" id="hd_id3151315" xml-lang="en-US" level="3" l10n="CHG" oldref="25">Don't split table</paragraph>
<paragraph role="paragraph" id="par_id3147530" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SW:CHECKBOX:DLG_CONV_TEXT_TABLE:CB_DONT_SPLIT">Does not divide the table across pages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_CONV_TEXT_TABLE:CB_BORDER" id="bm_id3149123" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_BORDER" id="bm_id3149123" localize="false"/>
<paragraph role="heading" id="hd_id3154472" xml-lang="en-US" level="3" l10n="U" oldref="26">Border</paragraph>
<paragraph role="paragraph" id="par_id3154570" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SW:CHECKBOX:DLG_CONV_TEXT_TABLE:CB_BORDER">Adds a border to the table and the table cells.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/swriter/01/06100000.xhp b/helpcontent2/source/text/swriter/01/06100000.xhp
index 519642a818..930574bb1a 100644
--- a/helpcontent2/source/text/swriter/01/06100000.xhp
+++ b/helpcontent2/source/text/swriter/01/06100000.xhp
@@ -56,65 +56,65 @@
<embed href="text/swriter/00/00000406.xhp#sortieren"/>
</section>
<paragraph xml-lang="en-US" id="hd_id3150931" role="heading" level="2" l10n="U" oldref="3">Sort criteria</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_SORTING:CB_KEY1" id="bm_id3153926" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_SORTING:CB_KEY2" id="bm_id3166462" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_SORTING:CB_KEY3" id="bm_id3166466" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_SORTING:CB_KEY1" id="bm_id3153926" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_SORTING:CB_KEY2" id="bm_id3166462" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_SORTING:CB_KEY3" id="bm_id3166466" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3149029" role="heading" level="2" l10n="U" oldref="4">Keys 1 to 3</paragraph>
<paragraph xml-lang="en-US" id="par_id3147170" role="paragraph" l10n="U" oldref="5"><ahelp hid="SW:CHECKBOX:DLG_SORTING:CB_KEY3">Specifies additional sorting criteria. You can also combine sort keys.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:DLG_SORTING:ED_KEY1" id="bm_id3156318" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:DLG_SORTING:ED_KEY2" id="bm_id3156322" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:DLG_SORTING:ED_KEY3" id="bm_id3154638" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_SORTING:ED_KEY1" id="bm_id3156318" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_SORTING:ED_KEY2" id="bm_id3156322" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_SORTING:ED_KEY3" id="bm_id3154638" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3147565" role="heading" level="2" l10n="U" oldref="6">Column 1 to 3</paragraph>
<paragraph xml-lang="en-US" id="par_id3154644" role="paragraph" l10n="CHG" oldref="7"><ahelp hid="SW:NUMERICFIELD:DLG_SORTING:ED_KEY3">Enter the number of the table column that you want to use as a basis for sorting.</ahelp></paragraph><comment>removed a para</comment>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:DLG_SORTING:DLB_KEY1" id="bm_id3149286" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:DLG_SORTING:DLB_KEY2" id="bm_id3149289" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:DLG_SORTING:DLB_KEY3" id="bm_id3149292" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_SORTING:DLB_KEY1" id="bm_id3149286" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_SORTING:DLB_KEY2" id="bm_id3149289" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_SORTING:DLB_KEY3" id="bm_id3149292" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3150254" role="heading" level="2" l10n="U" oldref="9">Key type 1 to 3</paragraph>
<paragraph xml-lang="en-US" id="par_id3149752" role="paragraph" l10n="U" oldref="10"><ahelp hid="SW:LISTBOX:DLG_SORTING:DLB_KEY3">Select the sorting option that you want to use.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id3151177" role="heading" level="2" l10n="U"
oldref="16">Order</paragraph>
<paragraph xml-lang="en-US" id="hd_id072020090105453" role="heading" level="3" l10n="NEW">Ascending</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_SORTING:RB_UP" id="bm_id3147506" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_SORTING:RB_UP2" id="bm_id3147509" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_SORTING:RB_UP3" id="bm_id3147513" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_SORTING:RB_UP" id="bm_id3147506" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_SORTING:RB_UP2" id="bm_id3147509" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_SORTING:RB_UP3" id="bm_id3147513" localize="false"/>
<paragraph xml-lang="en-US" id="par_id3154270" role="paragraph" l10n="U" oldref="18"><ahelp hid="SW:RADIOBUTTON:DLG_SORTING:RB_UP3">Sorts in ascending order, (for example, 1, 2, 3 or a, b, c).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_SORTING:RB_DN" id="bm_id3154101" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_SORTING:RB_DN2" id="bm_id3154104" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_SORTING:RB_DN3" id="bm_id3152938" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_SORTING:RB_DN" id="bm_id3154101" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_SORTING:RB_DN2" id="bm_id3154104" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_SORTING:RB_DN3" id="bm_id3152938" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3150708" role="heading" level="2" l10n="U"
oldref="19">Descending</paragraph>
<paragraph xml-lang="en-US" id="par_id3152946" role="paragraph" l10n="U" oldref="20"><ahelp hid="SW:RADIOBUTTON:DLG_SORTING:RB_DN3">Sorts in descending order (for example, 9, 8, 7 or z, y, x).</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id3149812" role="heading" level="2" l10n="U"
oldref="11">Direction</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_SORTING:RB_COL" id="bm_id3152962" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_SORTING:RB_COL" id="bm_id3152962" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3153540" role="heading" level="2" l10n="U"
oldref="12">Columns</paragraph>
<paragraph xml-lang="en-US" id="par_id3150973" role="paragraph" l10n="U" oldref="13"><ahelp hid="SW:RADIOBUTTON:DLG_SORTING:RB_COL">Sorts the columns in the table according to the current sort options.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_SORTING:RB_ROW" id="bm_id3153670" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_SORTING:RB_ROW" id="bm_id3153670" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3147526" role="heading" level="2" l10n="U"
oldref="14">Rows</paragraph>
<paragraph xml-lang="en-US" id="par_id3153677" role="paragraph" l10n="U" oldref="15"><ahelp hid="SW:RADIOBUTTON:DLG_SORTING:RB_ROW">Sorts the rows in the table or the paragraphs in the selection according to the current sort options.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id3151312" role="heading" level="2" l10n="U"
oldref="21">Separator</paragraph>
<paragraph xml-lang="en-US" id="par_id3150350" role="paragraph" l10n="U" oldref="22">Paragraphs are separated by nonprinting paragraph marks. You can also specify that tabs or a character act as separators when you sort paragraphs.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_SORTING:RB_TAB" id="bm_id3155896" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_SORTING:RB_TAB" id="bm_id3155896" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3154570" role="heading" level="2" l10n="U"
oldref="23">Tabs</paragraph>
<paragraph xml-lang="en-US" id="par_id3155902" role="paragraph" l10n="U" oldref="24"><ahelp hid="SW:RADIOBUTTON:DLG_SORTING:RB_TAB">If the selected paragraphs correspond to a list separated by tabs, select this option.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_SORTING:RB_TABCH" id="bm_id3154201" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_SORTING:ED_TABCH" id="bm_id3159190" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_SORTING:RB_TABCH" id="bm_id3154201" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_SORTING:ED_TABCH" id="bm_id3159190" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3154190" role="heading" level="2" l10n="U"
oldref="25">Character</paragraph>
<paragraph xml-lang="en-US" id="par_id3159196" role="paragraph" l10n="U" oldref="26"><ahelp hid="SW:EDIT:DLG_SORTING:ED_TABCH">Enter the character that you want to use as a separator in the selected area.</ahelp> By using the separator, $[officename] can determine the position of the sorting key in the selected paragraph.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_PUSHBUTTON_DLG_SORTING_PB_DELIM" id="bm_id3151335" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_SORTING:PB_DELIM" id="bm_id3151335" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3151324" role="heading" level="2" l10n="U"
oldref="31">...</paragraph>
<paragraph xml-lang="en-US" id="par_id3155178" role="paragraph" l10n="U" oldref="32"><ahelp hid="SW_PUSHBUTTON_DLG_SORTING_PB_DELIM">Opens the <emph>Special Characters</emph> dialog, where you can select the character that you want to use as a separator.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_DLG_SORTING_LB_LANG" id="bm_id3149494" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_SORTING:LB_LANG" id="bm_id3149494" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3149482" role="heading" level="2" l10n="U"
oldref="33">Language</paragraph>
<paragraph xml-lang="en-US" id="par_id3151252" role="paragraph" l10n="U" oldref="34"><ahelp hid="SW_LISTBOX_DLG_SORTING_LB_LANG">Select the language that defines the sorting rules.</ahelp> Some languages sort special characters differently than other languages.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_DLG_SORTING_CB_CASE" id="bm_id3154832" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_SORTING:CB_CASE" id="bm_id3154832" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3149104" role="heading" level="2" l10n="U"
oldref="35">Match case</paragraph>
<paragraph xml-lang="en-US" id="par_id3154838" role="paragraph" l10n="CHG" oldref="36"><ahelp hid="SW_CHECKBOX_DLG_SORTING_CB_CASE">Distinguishes between uppercase and lowercase letters when you sort a table. For Asian languages special handling applies.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/swriter/01/06180000.xhp b/helpcontent2/source/text/swriter/01/06180000.xhp
index 0bf9994548..423381e422 100644
--- a/helpcontent2/source/text/swriter/01/06180000.xhp
+++ b/helpcontent2/source/text/swriter/01/06180000.xhp
@@ -51,44 +51,44 @@
<section id="howtoget">
<embed href="text/swriter/00/00000406.xhp#zeilennumerierung"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_LINENUMBERING:CB_NUMBERING_ON" id="bm_id3147402" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_LINENUMBERING:CB_NUMBERING_ON" id="bm_id3147402" localize="false"/>
<paragraph role="heading" id="hd_id3146965" xml-lang="en-US" level="2" l10n="U" oldref="5">Show numbering</paragraph>
<paragraph role="paragraph" id="par_id3147295" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:CHECKBOX:TP_LINENUMBERING:CB_NUMBERING_ON">Adds line numbers to the current document.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3083449" xml-lang="en-US" level="2" l10n="U" oldref="7">View</paragraph>
<paragraph role="paragraph" id="par_id3155621" xml-lang="en-US" l10n="U" oldref="8">Set the properties of the line numbering.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_LINENUMBERING:LB_CHAR_STYLE" id="bm_id3154558" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_LINENUMBERING:LB_CHAR_STYLE" id="bm_id3154558" localize="false"/>
<paragraph role="heading" id="hd_id3145822" xml-lang="en-US" level="3" l10n="U" oldref="9">Character Style</paragraph>
<paragraph role="paragraph" id="par_id3153000" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:LISTBOX:TP_LINENUMBERING:LB_CHAR_STYLE">Select the formatting style that you want to use for the line numbers.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_LINENUMBERING:LB_FORMAT" id="bm_id3150020" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_LINENUMBERING:LB_FORMAT" id="bm_id3150020" localize="false"/>
<paragraph role="heading" id="hd_id3149880" xml-lang="en-US" level="3" l10n="U" oldref="11">Format</paragraph>
<paragraph role="paragraph" id="par_id3145246" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:LISTBOX:TP_LINENUMBERING:LB_FORMAT">Select the numbering style that you want to use.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_LINENUMBERING:LB_POS" id="bm_id3148774" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_LINENUMBERING:LB_POS" id="bm_id3148774" localize="false"/>
<paragraph role="heading" id="hd_id3150569" xml-lang="en-US" level="3" l10n="U" oldref="13">Position</paragraph>
<paragraph role="paragraph" id="par_id3150932" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW:LISTBOX:TP_LINENUMBERING:LB_POS">Select where you want the line numbers to appear.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_LINENUMBERING:MF_OFFSET" id="bm_id3153924" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_LINENUMBERING:MF_OFFSET" id="bm_id3153924" localize="false"/>
<paragraph role="heading" id="hd_id3155986" xml-lang="en-US" level="3" l10n="U" oldref="15">Spacing</paragraph>
<paragraph role="paragraph" id="par_id3153719" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW:METRICFIELD:TP_LINENUMBERING:MF_OFFSET">Enter the amount of space that you want to leave between the line numbers and the text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_LINENUMBERING:NF_NUM_INVERVAL" id="bm_id3151267" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_LINENUMBERING:NF_NUM_INVERVAL" id="bm_id3151267" localize="false"/>
<paragraph role="heading" id="hd_id3151183" xml-lang="en-US" level="3" l10n="U" oldref="17">Interval</paragraph>
<paragraph role="paragraph" id="par_id3151272" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:NUMERICFIELD:TP_LINENUMBERING:NF_NUM_INVERVAL">Enter the counting interval for the line numbers.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3156321" xml-lang="en-US" level="2" l10n="U" oldref="19">Separator</paragraph>
<paragraph role="paragraph" id="par_id3150765" xml-lang="en-US" l10n="U" oldref="20">You can enter a separator character to display between line numbers if the counting interval is more than one.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_LINENUMBERING:ED_DIVISOR" id="bm_id3153150" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_LINENUMBERING:ED_DIVISOR" id="bm_id3153150" localize="false"/>
<paragraph role="heading" id="hd_id3150258" xml-lang="en-US" level="3" l10n="U" oldref="22">Text</paragraph>
<paragraph role="paragraph" id="par_id3149286" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SW:EDIT:TP_LINENUMBERING:ED_DIVISOR">Enter the text that you want to use as a separator.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_LINENUMBERING:NF_DIV_INTERVAL" id="bm_id3151175" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_LINENUMBERING:NF_DIV_INTERVAL" id="bm_id3151175" localize="false"/>
<paragraph role="heading" id="hd_id3149757" xml-lang="en-US" level="3" l10n="U" oldref="24">Every</paragraph>
<paragraph role="paragraph" id="par_id3145412" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SW:NUMERICFIELD:TP_LINENUMBERING:NF_DIV_INTERVAL">Enter the number of lines to leave between the separators.</ahelp></paragraph>
<paragraph role="note" id="par_id3153532" xml-lang="en-US" l10n="U" oldref="26">Separators are only displayed in lines that are not numbered.</paragraph>
<paragraph role="heading" id="hd_id3152962" xml-lang="en-US" level="2" l10n="U" oldref="27">Count</paragraph>
<paragraph role="paragraph" id="par_id3150358" xml-lang="en-US" l10n="U" oldref="28">Specify whether to include empty paragraphs or lines in text frames in the line count.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_LINENUMBERING:CB_COUNT_EMPTYLINES" id="bm_id3154573" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_LINENUMBERING:CB_COUNT_EMPTYLINES" id="bm_id3154573" localize="false"/>
<paragraph role="heading" id="hd_id3153677" xml-lang="en-US" level="3" l10n="U" oldref="29">Blank lines</paragraph>
<paragraph role="paragraph" id="par_id3150973" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SW:CHECKBOX:TP_LINENUMBERING:CB_COUNT_EMPTYLINES">Includes empty paragraphs in the line count.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_LINENUMBERING:CB_COUNT_FRAMELINES" id="bm_id3150990" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_LINENUMBERING:CB_COUNT_FRAMELINES" id="bm_id3150990" localize="false"/>
<paragraph role="heading" id="hd_id3154476" xml-lang="en-US" level="3" l10n="U" oldref="31">Lines in text frames</paragraph>
<paragraph role="paragraph" id="par_id3150995" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SW:CHECKBOX:TP_LINENUMBERING:CB_COUNT_FRAMELINES">Adds line numbers to text in text frames. The numbering restarts in each text frame, and is excluded from the line count in the main text area of the document.</ahelp> In <link href="text/swriter/02/03210000.xhp" name="linked frames">linked frames</link>, the numbering is not restarted.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_LINENUMBERING_CB_RESTART_PAGE" id="bm_id3155902" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_LINENUMBERING:CB_RESTART_PAGE" id="bm_id3155902" localize="false"/>
<paragraph role="heading" id="hd_id3151320" xml-lang="en-US" level="3" l10n="U" oldref="34">Restart every new page</paragraph>
<paragraph role="paragraph" id="par_id3149685" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="SW_CHECKBOX_TP_LINENUMBERING_CB_RESTART_PAGE">Restarts line numbering at the top of each page in the document.</ahelp></paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/helpcontent2/source/text/swriter/01/mailmerge00.xhp b/helpcontent2/source/text/swriter/01/mailmerge00.xhp
index fc484da090..85044bad6e 100755
--- a/helpcontent2/source/text/swriter/01/mailmerge00.xhp
+++ b/helpcontent2/source/text/swriter/01/mailmerge00.xhp
@@ -41,7 +41,7 @@
</meta>
<body>
<section id="mailmerge">
-<bookmark xml-lang="en-US" branch="hid/20367" id="bm_id4642780" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/FN_QRY_MERGE" id="bm_id4642780" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/FN_MAILMERGE_WIZARD" id="bm_id6627657" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:MailMergeWizard" id="bm_id5430463" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/FN_QRY_MERGE" id="bm_id9926450" localize="false"/>
diff --git a/helpcontent2/source/text/swriter/01/mailmerge01.xhp b/helpcontent2/source/text/swriter/01/mailmerge01.xhp
index 5d71c91a0f..782c99f6a7 100755
--- a/helpcontent2/source/text/swriter/01/mailmerge01.xhp
+++ b/helpcontent2/source/text/swriter/01/mailmerge01.xhp
@@ -44,28 +44,28 @@
<paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge01.xhp">Mail Merge Wizard - Starting Document</link></paragraph>
<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW">Specify the document that you want to use as a base for the mail merge document.</paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_DOCSELECT_PAGE_RB_CURRENTDOC" id="bm_id9740592.00000001" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_DOCSELECT_PAGE:RB_CURRENTDOC" id="bm_id9740592.00000001" localize="false"/>
<paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="NEW">Use the current document</paragraph>
<paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Uses the current Writer document as the base for the mail merge document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_DOCSELECT_PAGE_RB_NEWDOC" id="bm_id501724" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_DOCSELECT_PAGE:RB_NEWDOC" id="bm_id501724" localize="false"/>
<paragraph role="heading" id="par_idN1055D" xml-lang="en-US" level="2" l10n="NEW">Create a new document</paragraph>
<paragraph role="paragraph" id="par_idN10561" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Creates a new Writer document to use for the mail merge.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_DOCSELECT_PAGE_RB_LOADDOC" id="bm_id216986" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_DOCSELECT_PAGE:RB_LOADDOC" id="bm_id216986" localize="false"/>
<paragraph role="heading" id="par_idN10564" xml-lang="en-US" level="2" l10n="NEW">Start from existing document</paragraph>
<paragraph role="paragraph" id="par_idN10568" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select an existing Writer document to use as the base for the mail merge document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_DOCSELECT_PAGE_PB_LOADDOC" id="bm_id7658314" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_DOCSELECT_PAGE:PB_LOADDOC" id="bm_id7658314" localize="false"/>
<paragraph role="heading" id="par_idN1056B" xml-lang="en-US" level="3" l10n="NEW">Browse</paragraph>
<paragraph role="paragraph" id="par_idN1056F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Locate the Writer document that you want too use, and then click <emph>Open</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_DOCSELECT_PAGE_RB_LOADTEMPLATE" id="bm_id1717886" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_DOCSELECT_PAGE:RB_LOADTEMPLATE" id="bm_id1717886" localize="false"/>
<paragraph role="heading" id="par_idN10572" xml-lang="en-US" level="2" l10n="NEW">Start from a template</paragraph>
<paragraph role="paragraph" id="par_idN10576" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the template that you want to create your mail merge document with.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_DOCSELECT_PAGE_PB_BROWSETEMPLATE" id="bm_id3173619" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_DOCSELECT_PAGE:PB_BROWSETEMPLATE" id="bm_id3173619" localize="false"/>
<paragraph role="heading" id="par_idN10579" xml-lang="en-US" level="3" l10n="NEW">Browse</paragraph>
<paragraph role="paragraph" id="par_idN1057D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <emph>Templates and Documents</emph> dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_DOCSELECT_PAGE_RB_RECENTDOC" id="bm_id6065248" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_DOCSELECT_PAGE:RB_RECENTDOC" id="bm_id6065248" localize="false"/>
<paragraph role="heading" id="par_idN10584" xml-lang="en-US" level="2" l10n="NEW">Start from a recently saved starting document</paragraph>
<paragraph role="paragraph" id="par_idN10588" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Use an existing mail merge document as the base for a new mail merge document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_ListBox_DLG_MM_DOCSELECT_PAGE_LB_RECENTDOC" id="bm_id920133" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_MM_DOCSELECT_PAGE:LB_RECENTDOC" id="bm_id920133" localize="false"/>
<paragraph role="paragraph" id="par_idN106F6" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the document.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN1058B" xml-lang="en-US" l10n="NEW"><link href="text/swriter/01/mailmerge02.xhp" name="Mail Merge Wizard - Document type">Mail Merge Wizard - Document type</link></paragraph>
</body>
diff --git a/helpcontent2/source/text/swriter/01/mailmerge02.xhp b/helpcontent2/source/text/swriter/01/mailmerge02.xhp
index 6ab0996652..b56cf20467 100755
--- a/helpcontent2/source/text/swriter/01/mailmerge02.xhp
+++ b/helpcontent2/source/text/swriter/01/mailmerge02.xhp
@@ -44,10 +44,10 @@
<paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge02.xhp">Mail Merge Wizard - Document Type</link></paragraph>
<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="CHG">Specify the type of mail merge document to create. </paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_OUTPUTTYPE_PAGE_RB_LETTER" id="bm_id2589190" localize="false"/><paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="NEW">Letter</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_OUTPUTTYPE_PAGE:RB_LETTER" id="bm_id2589190" localize="false"/><paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="NEW">Letter</paragraph>
<paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Creates a printable mail merge document.</ahelp></paragraph>
<paragraph role="heading" id="hd_id6954863" xml-lang="en-US" level="2" l10n="NEW">E-mail message</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_OUTPUTTYPE_PAGE_RB_MAIL" id="bm_id3822443" localize="false"/><paragraph role="paragraph" id="par_idN10561" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Creates mail merge documents that you can send as an e-mail message or an e-mail attachment.</ahelp> This feature needs Java Mail. If Java Mail is not installed, you can download the software from <link href="http://java.sun.com/products/javamail/">http://java.sun.com/products/javamail/</link>.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_OUTPUTTYPE_PAGE:RB_MAIL" id="bm_id3822443" localize="false"/><paragraph role="paragraph" id="par_idN10561" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Creates mail merge documents that you can send as an e-mail message or an e-mail attachment.</ahelp> This feature needs Java Mail. If Java Mail is not installed, you can download the software from <link href="http://java.sun.com/products/javamail/">http://java.sun.com/products/javamail/</link>.</paragraph>
<paragraph role="paragraph" id="par_idN10572" xml-lang="en-US" l10n="NEW"><link href="text/swriter/01/mailmerge03.xhp" name="Mail Merge Wizard - Addresses">Mail Merge Wizard - Addresses</link></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/mailmerge03.xhp b/helpcontent2/source/text/swriter/01/mailmerge03.xhp
index 74cac90083..1fb279c293 100755
--- a/helpcontent2/source/text/swriter/01/mailmerge03.xhp
+++ b/helpcontent2/source/text/swriter/01/mailmerge03.xhp
@@ -48,25 +48,25 @@
</section>
<paragraph role="note" id="par_idN10561" xml-lang="en-US" l10n="NEW">The Mail Merge wizard opens to this page if you start the wizard in a text document that already contains address database fields. If the wizard opens directly to this page, the <emph>Select address list</emph> button is called <emph>Select different address list</emph>.</paragraph>
<paragraph role="note" id="par_idN10556" xml-lang="en-US" l10n="NEW">The title of this page is <emph>Address block</emph> for letters and <emph>Address list</emph> for e-mail messages.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_ADDRESSBLOCK_PAGE_PB_ADDRESSLIST" id="bm_id8489028" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_ADDRESSBLOCK_PAGE:PB_ADDRESSLIST" id="bm_id8489028" localize="false"/>
<paragraph role="heading" id="par_idN10568" xml-lang="en-US" level="2" l10n="NEW">Select address list</paragraph>
<paragraph role="paragraph" id="par_idN1056C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_seladdlis.xhp">Select Address List</link> dialog, where you can choose a data source for the addresses, add new addresses, or type in a new address list.</ahelp></paragraph>
<paragraph role="warning" id="par_id7805413" xml-lang="en-US" l10n="NEW">When you edit some records in a Calc spreadsheet data source that is currently in use for a mail merge, those changes are not visible in the mail merge.<comment>ufi: see i9899</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_DLG_MM_ADDRESSBLOCK_PAGE_CB_ADDRESS" id="bm_id934476" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_MM_ADDRESSBLOCK_PAGE:CB_ADDRESS" id="bm_id934476" localize="false"/>
<paragraph role="heading" id="par_idN1057D" xml-lang="en-US" level="2" l10n="NEW">This document shall contain an address block</paragraph>
<paragraph role="paragraph" id="par_idN10581" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds an address block to the mail merge document.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN10584" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the address block layout that you want to use.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/898237515" id="bm_id59205" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_DLG_MM_ADDRESSBLOCK_PAGE_CB_HIDE_EMPTY_PARA" id="bm_id59205" localize="false"/>
<paragraph role="heading" id="hd_id9355754" xml-lang="en-US" level="3" l10n="NEW">Suppress lines with just empty fields</paragraph>
<paragraph role="paragraph" id="par_id3109225" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable to leave empty lines out of the address.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_ADDRESSBLOCK_PAGE_PB_SETTINGS" id="bm_id8949247" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_ADDRESSBLOCK_PAGE:PB_SETTINGS" id="bm_id8949247" localize="false"/>
<paragraph role="heading" id="par_idN10587" xml-lang="en-US" level="3" l10n="NEW">More</paragraph>
<paragraph role="paragraph" id="par_idN1058B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_seladdblo.xhp">Select Address Block</link> dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_ADDRESSBLOCK_PAGE_PB_ASSIGN" id="bm_id8653523" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_ADDRESSBLOCK_PAGE:PB_ASSIGN" id="bm_id8653523" localize="false"/>
<paragraph role="heading" id="par_idN1059C" xml-lang="en-US" level="3" l10n="NEW">Match fields</paragraph>
<paragraph role="paragraph" id="par_idN105A0" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_matfie.xhp">Match Fields</link> dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_ImageButton_DLG_MM_ADDRESSBLOCK_PAGE_IB_PREVSET" id="bm_id2950224" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw_ImageButton_DLG_MM_ADDRESSBLOCK_PAGE_IB_NEXTSET" id="bm_id8050477" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_MM_ADDRESSBLOCK_PAGE:IB_PREVSET" id="bm_id2950224" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_MM_ADDRESSBLOCK_PAGE:IB_NEXTSET" id="bm_id8050477" localize="false"/>
<paragraph role="heading" id="par_idN105B1" xml-lang="en-US" level="3" l10n="NEW">(Browse buttons)</paragraph>
<paragraph role="paragraph" id="par_idN105B5" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Use the browse buttons to preview the information from the previous or next data record.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN105B8" xml-lang="en-US" l10n="CHG"><link href="text/swriter/01/mailmerge04.xhp" name="Mail Merge Wizard - Create a salutation">Mail Merge Wizard - Create a salutation</link></paragraph>
diff --git a/helpcontent2/source/text/swriter/01/mailmerge04.xhp b/helpcontent2/source/text/swriter/01/mailmerge04.xhp
index 49f3a9188e..55def9dbf5 100755
--- a/helpcontent2/source/text/swriter/01/mailmerge04.xhp
+++ b/helpcontent2/source/text/swriter/01/mailmerge04.xhp
@@ -46,40 +46,40 @@
<paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge04.xhp">Mail Merge Wizard - Create a Salutation</link></paragraph>
<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW">Specify the properties for the salutation. If the mail merge database contains gender information, you can specify different salutations based on the gender of the recipient.</paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/898253839" id="bm_id274666" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_DLG_MM_GREETINGS_PAGE_CB_GREETINGLINE" id="bm_id274666" localize="false"/>
<paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="NEW">This document should contain a salutation</paragraph>
<paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds a salutation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/898253826" id="bm_id7168492" localize="false"/>
+<!-- removed HID 898253826 -->
<paragraph role="heading" id="par_idN1055D" xml-lang="en-US" level="3" l10n="NEW">Insert personalized salutation</paragraph>
<paragraph role="paragraph" id="par_idN10561" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds a personalized salutation to the mail merge document. To use the default salutation, clear this check box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/898256387" id="bm_id1347392" localize="false"/>
+<!-- removed HID 898256387 -->
<paragraph role="heading" id="par_idN10564" xml-lang="en-US" level="4" l10n="NEW">Female</paragraph>
<paragraph role="paragraph" id="par_idN10568" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the personalized greeting for a female recipient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/898257412" id="bm_id7285073" localize="false"/>
+<!-- removed HID 898257412 -->
<paragraph role="heading" id="par_idN1056B" xml-lang="en-US" level="4" l10n="NEW">New</paragraph>
<paragraph role="paragraph" id="par_idN1056F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_cusgrelin.xhp">Custom Salutation</link> (Female recipient) dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/898256389" id="bm_id3386333" localize="false"/>
+<!-- removed HID 898256389 -->
<paragraph role="heading" id="par_idN10580" xml-lang="en-US" level="4" l10n="NEW">Male</paragraph>
<paragraph role="paragraph" id="par_idN10584" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the personalized greeting for a male recipient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/898257414" id="bm_id1029084" localize="false"/>
+<!-- removed HID 898257414 -->
<paragraph role="heading" id="par_idN10587" xml-lang="en-US" level="4" l10n="NEW">New</paragraph>
<paragraph role="paragraph" id="par_idN1058B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_cusgrelin.xhp">Custom Salutation</link> (Male recipient) dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/898256393" id="bm_id4558244" localize="false"/>
+<!-- removed HID 898256393 -->
<paragraph role="heading" id="par_idN1059C" xml-lang="en-US" level="4" l10n="NEW">Field name</paragraph>
<paragraph role="paragraph" id="par_idN105A0" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the field name of the address database field that contains the gender information.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/898256907" id="bm_id960722" localize="false"/>
+<!-- removed HID 898256907 -->
<paragraph role="heading" id="par_idN105A3" xml-lang="en-US" level="4" l10n="NEW">Field value</paragraph>
<paragraph role="paragraph" id="par_idN105A7" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the field value that indicates the gender of the recipient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/898256910" id="bm_id4571672" localize="false"/>
+<!-- removed HID 898256910 -->
<paragraph role="heading" id="par_idN105AA" xml-lang="en-US" level="3" l10n="NEW">General salutation</paragraph>
<paragraph role="paragraph" id="par_idN105AE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the default salutation that is used when you do not specify a personalized salutation.</ahelp></paragraph>
<paragraph role="heading" id="par_idN105B1" xml-lang="en-US" level="3" l10n="NEW">Preview</paragraph>
<paragraph role="paragraph" id="par_idN105B5" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays a preview of the salutation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/898257426" id="bm_id9288918" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_PUSHBUTTON_DLG_MM_GREETINGS_PAGE_PB_ASSIGN" id="bm_id9288918" localize="false"/>
<paragraph role="heading" id="par_idN105B8" xml-lang="en-US" level="4" l10n="NEW">Match fields</paragraph>
<paragraph role="paragraph" id="par_idN105BC" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_matfie.xhp">Match Fields</link> dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/898264596" id="bm_id3859675" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/898264597" id="bm_id991546" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_IMAGEBUTTON_DLG_MM_GREETINGS_PAGE_IB_PREVSET" id="bm_id3859675" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_IMAGEBUTTON_DLG_MM_GREETINGS_PAGE_IB_NEXTSET" id="bm_id991546" localize="false"/>
<paragraph role="heading" id="par_idN105CD" xml-lang="en-US" level="4" l10n="NEW">(Browse buttons)</paragraph>
<paragraph role="paragraph" id="par_idN105D1" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Use the browse buttons to preview the information from the previous or next data record.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN105D4" xml-lang="en-US" l10n="CHG"><link href="text/swriter/01/mailmerge05.xhp" name="Mail Merge Wizard - Adjust layout">Mail Merge Wizard - Adjust layout</link></paragraph>
diff --git a/helpcontent2/source/text/swriter/01/mailmerge05.xhp b/helpcontent2/source/text/swriter/01/mailmerge05.xhp
index fc572b51d9..77df875c5d 100755
--- a/helpcontent2/source/text/swriter/01/mailmerge05.xhp
+++ b/helpcontent2/source/text/swriter/01/mailmerge05.xhp
@@ -46,22 +46,22 @@
<paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge05.xhp">Mail Merge Wizard - Adjust Layout</link></paragraph>
<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW">Specify the position of the address blocks and salutations on the documents.</paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_DLG_MM_LAYOUT_PAGE_CB_ALIGN" id="bm_id7631458" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_MM_LAYOUT_PAGE:CB_ALIGN" id="bm_id7631458" localize="false"/>
<paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="NEW">Align to text body</paragraph>
<paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Aligns the frame that contains the address block to the left page margin.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_MetricField_DLG_MM_LAYOUT_PAGE_MF_LEFT" id="bm_id7862483" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:DLG_MM_LAYOUT_PAGE:MF_LEFT" id="bm_id7862483" localize="false"/>
<paragraph role="heading" id="par_idN1055D" xml-lang="en-US" level="2" l10n="NEW">From left</paragraph>
<paragraph role="paragraph" id="par_idN10561" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the amount of space to leave between the left edge of the page and the left edge of the address block.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_MetricField_DLG_MM_LAYOUT_PAGE_MF_TOP" id="bm_id1113010" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:DLG_MM_LAYOUT_PAGE:MF_TOP" id="bm_id1113010" localize="false"/>
<paragraph role="heading" id="par_idN10564" xml-lang="en-US" level="2" l10n="NEW">From top</paragraph>
<paragraph role="paragraph" id="par_idN10568" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the amount of space to leave between the top edge of the page and the top edge of the address block.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_LAYOUT_PAGE_MF_UP" id="bm_id656758" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_LAYOUT_PAGE:MF_UP" id="bm_id656758" localize="false"/>
<paragraph role="heading" id="par_idN1056B" xml-lang="en-US" level="2" l10n="NEW">Up</paragraph>
<paragraph role="paragraph" id="par_idN1056F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Moves the salutation up.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_LAYOUT_PAGE_PB_DOWN" id="bm_id3112582" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_LAYOUT_PAGE:PB_DOWN" id="bm_id3112582" localize="false"/>
<paragraph role="heading" id="par_idN10572" xml-lang="en-US" level="2" l10n="NEW">Down</paragraph>
<paragraph role="paragraph" id="par_idN10576" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Moves the salutation down.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_ListBox_DLG_MM_LAYOUT_PAGE_LB_ZOOM" id="bm_id628070" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_MM_LAYOUT_PAGE:LB_ZOOM" id="bm_id628070" localize="false"/>
<paragraph role="heading" id="par_idN10579" xml-lang="en-US" level="2" l10n="NEW">Zoom</paragraph>
<paragraph role="paragraph" id="par_idN1057D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a magnification for the page preview.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN106AF" xml-lang="en-US" l10n="NEW">Use the commands in the context menu of the preview to move the view up and down.</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/mailmerge06.xhp b/helpcontent2/source/text/swriter/01/mailmerge06.xhp
index 6f766359f5..898504cd81 100755
--- a/helpcontent2/source/text/swriter/01/mailmerge06.xhp
+++ b/helpcontent2/source/text/swriter/01/mailmerge06.xhp
@@ -46,18 +46,18 @@
<paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge06.xhp">Mail Merge Wizard - Edit Document</link></paragraph>
<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW">Browse through the document previews, exclude single recipients, and edit the main document.</paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/sw_NumericField_DLG_MM_PREPAREMERGE_PAGE_ED_RECORD" id="bm_id9046601" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_MM_PREPAREMERGE_PAGE:ED_RECORD" id="bm_id9046601" localize="false"/>
<paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="NEW">Recipient</paragraph>
<paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the address record number of a recipient to preview the mail merge document for the recipient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_PREPAREMERGE_PAGE_PB_FIRST" id="bm_id735801" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_PREPAREMERGE_PAGE_PB_PREV" id="bm_id290536" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_PREPAREMERGE_PAGE_PB_NEXT" id="bm_id2619708" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_PREPAREMERGE_PAGE_PB_LAST" id="bm_id1293679" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_FIRST" id="bm_id735801" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_PREV" id="bm_id290536" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_NEXT" id="bm_id2619708" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_LAST" id="bm_id1293679" localize="false"/>
<paragraph role="paragraph" id="par_idN10604" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Use the browse buttons to scroll through the address records.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_DLG_MM_PREPAREMERGE_PAGE_CB_EXCLUDE" id="bm_id108340" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_MM_PREPAREMERGE_PAGE:CB_EXCLUDE" id="bm_id108340" localize="false"/>
<paragraph role="heading" id="par_idN1055D" xml-lang="en-US" level="3" l10n="NEW">Exclude this recipient</paragraph>
<paragraph role="paragraph" id="par_idN10561" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Excludes the current recipient from this mail merge.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_PREPAREMERGE_PAGE_PB_EDIT" id="bm_id1743827" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_EDIT" id="bm_id1743827" localize="false"/>
<paragraph role="heading" id="par_idN10564" xml-lang="en-US" level="2" l10n="NEW">Edit Document</paragraph>
<paragraph role="paragraph" id="par_idN10568" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Minimizes the wizard so that you can edit the main mail merge document for all recipients.</ahelp> To return to the wizard, click the <emph>Return to Mail Merge Wizard</emph> button.</paragraph>
<paragraph role="paragraph" id="par_idN1056F" xml-lang="en-US" l10n="CHG"><link href="text/swriter/01/mailmerge07.xhp" name="Mail Merge Wizard - Personalize document">Mail Merge Wizard - Personalize document</link></paragraph>
diff --git a/helpcontent2/source/text/swriter/01/mailmerge07.xhp b/helpcontent2/source/text/swriter/01/mailmerge07.xhp
index 2d9748e0f9..736d2af0af 100755
--- a/helpcontent2/source/text/swriter/01/mailmerge07.xhp
+++ b/helpcontent2/source/text/swriter/01/mailmerge07.xhp
@@ -45,22 +45,22 @@
<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW">Edit documents for each recipient.</paragraph>
</section>
<paragraph role="paragraph" id="par_idN10556" xml-lang="en-US" l10n="NEW">The Mail Merge Wizard creates a single merged document with page breaks between each recipient. When you reach this page of the wizard, the names and the addresses of the recipients are contained in the document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_MERGE_PAGE_PB_EDIT" id="bm_id664082" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_MERGE_PAGE:PB_EDIT" id="bm_id664082" localize="false"/>
<paragraph role="heading" id="par_idN10559" xml-lang="en-US" level="2" l10n="NEW">Edit individual document</paragraph>
<paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Minimizes the wizard so that you can edit the mail merge document for a single recipient.</ahelp> After you made your changes, click the <emph>Return to Mail Merge Wizard</emph> button.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_DLG_MM_MERGE_PAGE_ED_FIND" id="bm_id2794885" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_MM_MERGE_PAGE:ED_FIND" id="bm_id2794885" localize="false"/>
<paragraph role="heading" id="par_idN105FA" xml-lang="en-US" level="2" l10n="NEW">Search for</paragraph>
<paragraph role="paragraph" id="par_idN105FE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the text that you want to search for in the merged document, for example, the name of a recipient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_MERGE_PAGE_PB_FIND" id="bm_id2486342" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_MERGE_PAGE:PB_FIND" id="bm_id2486342" localize="false"/>
<paragraph role="heading" id="par_idN10564" xml-lang="en-US" level="2" l10n="NEW">Find</paragraph>
<paragraph role="paragraph" id="par_idN10568" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to start the search.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_DLG_MM_MERGE_PAGE_CB_WHOLEWORDS" id="bm_id823999" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_MM_MERGE_PAGE:CB_WHOLEWORDS" id="bm_id823999" localize="false"/>
<paragraph role="heading" id="par_idN1056B" xml-lang="en-US" level="3" l10n="NEW">Whole words only</paragraph>
<paragraph role="paragraph" id="par_idN1056F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Searches for whole words only and not parts of larger words.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_DLG_MM_MERGE_PAGE_CB_BACKWARDS" id="bm_id6592913" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_MM_MERGE_PAGE:CB_BACKWARDS" id="bm_id6592913" localize="false"/>
<paragraph role="heading" id="par_idN10572" xml-lang="en-US" level="3" l10n="NEW">Backwards</paragraph>
<paragraph role="paragraph" id="par_idN10576" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Searches from the current cursor position to the top of the document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_DLG_MM_MERGE_PAGE_CB_MATCHCASE" id="bm_id4656208" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_MM_MERGE_PAGE:CB_MATCHCASE" id="bm_id4656208" localize="false"/>
<paragraph role="heading" id="par_idN10579" xml-lang="en-US" level="3" l10n="NEW">Match case</paragraph>
<paragraph role="paragraph" id="par_idN1057D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Distinguishes between uppercase and lowercase characters in the search.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN10580" xml-lang="en-US" l10n="NEW"><link href="text/swriter/01/mailmerge08.xhp" name="Mail Merge Wizard - Save print send">Mail Merge Wizard - Save, print or send</link></paragraph>
diff --git a/helpcontent2/source/text/swriter/01/mailmerge08.xhp b/helpcontent2/source/text/swriter/01/mailmerge08.xhp
index 09df6fa021..f714f59b9b 100755
--- a/helpcontent2/source/text/swriter/01/mailmerge08.xhp
+++ b/helpcontent2/source/text/swriter/01/mailmerge08.xhp
@@ -47,74 +47,74 @@
<paragraph role="paragraph" id="par_idN1055C" xml-lang="en-US" l10n="NEW">Specifies the output options for mail merge documents.</paragraph>
</section>
<paragraph role="paragraph" id="par_idN1055F" xml-lang="en-US" l10n="NEW">The appearance of this page depends on the option that you select. After you specify the settings, click <emph>Finish</emph> to exit the wizard.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_SAVESTARTDOC" id="bm_id3743095" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SAVESTARTDOC" id="bm_id3743095" localize="false"/>
<paragraph role="heading" id="par_idN10578" xml-lang="en-US" level="2" l10n="NEW">Save starting document</paragraph>
<paragraph role="paragraph" id="par_idN1057C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Saves the starting document that contains the database fields.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_SAVESTARTDOC" id="bm_id8654133" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_SAVESTARTDOC" id="bm_id8654133" localize="false"/>
<paragraph role="heading" id="par_idN1057F" xml-lang="en-US" level="3" l10n="NEW">Save starting document</paragraph>
<paragraph role="paragraph" id="par_idN10583" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Saves the current document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_SAVEMERGEDDOC" id="bm_id5630664" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SAVEMERGEDDOC" id="bm_id5630664" localize="false"/>
<paragraph role="heading" id="par_idN10586" xml-lang="en-US" level="2" l10n="NEW">Save merged document</paragraph>
<paragraph role="paragraph" id="par_idN1058A" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Saves the merged document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_SAVEASONE" id="bm_id7217627" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SAVEASONE" id="bm_id7217627" localize="false"/>
<paragraph role="heading" id="par_idN1058D" xml-lang="en-US" level="3" l10n="NEW">Save as single document</paragraph>
<paragraph role="paragraph" id="par_idN10591" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Saves the merged document as a single file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_SAVEINDIVIDUAL" id="bm_id3735465" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SAVEINDIVIDUAL" id="bm_id3735465" localize="false"/>
<paragraph role="heading" id="par_idN10594" xml-lang="en-US" level="3" l10n="NEW">Save as individual documents</paragraph>
<paragraph role="paragraph" id="par_idN10598" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Saves the merged document as a separate file for each recipient. The file names of the documents are constructed from the name that you enter, followed by an underscore, and the number of the current record.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_FROM" id="bm_id941190" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_FROM" id="bm_id941190" localize="false"/>
<paragraph role="heading" id="par_idN1059B" xml-lang="en-US" level="3" l10n="NEW">From</paragraph>
<paragraph role="paragraph" id="par_idN1059F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Selects a range of records starting at the record number in the <emph>From</emph> box and ending at the record number in the <emph>To</emph> box. </ahelp><comment>UFI: used for saving and printing</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_NumericField_DLG_MM_OUTPUT_PAGE_NF_FROM" id="bm_id8942838" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_MM_OUTPUT_PAGE:NF_FROM" id="bm_id8942838" localize="false"/>
<paragraph role="heading" id="par_idN106DB" xml-lang="en-US" level="3" l10n="NEW">From</paragraph>
<paragraph role="paragraph" id="par_idN106E1" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the number of the first record to include in the mail merge.</ahelp><comment>UFI: also used for printing</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_NumericField_DLG_MM_OUTPUT_PAGE_NF_TO" id="bm_id7026886" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_MM_OUTPUT_PAGE:NF_TO" id="bm_id7026886" localize="false"/>
<paragraph role="heading" id="par_idN105A2" xml-lang="en-US" level="3" l10n="NEW">To</paragraph>
<paragraph role="paragraph" id="par_idN105A6" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the number of the last record to include in the mail merge.</ahelp><comment>UFI: also used for printing</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_SAVENOW" id="bm_id4436475" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_SAVENOW" id="bm_id4436475" localize="false"/>
<paragraph role="heading" id="par_idN105A9" xml-lang="en-US" level="3" l10n="NEW">Save Documents</paragraph>
<paragraph role="paragraph" id="par_idN105AD" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Saves the documents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_PRINT" id="bm_id7178868" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_PRINT" id="bm_id7178868" localize="false"/>
<paragraph role="heading" id="par_idN105B0" xml-lang="en-US" level="2" l10n="NEW">Print merged document</paragraph>
<paragraph role="paragraph" id="par_idN105B4" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Prints the output for all or some recipients.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_ListBox_DLG_MM_OUTPUT_PAGE_LB_PRINT" id="bm_id376598" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_MM_OUTPUT_PAGE:LB_PRINT" id="bm_id376598" localize="false"/>
<paragraph role="heading" id="par_idN105B7" xml-lang="en-US" level="3" l10n="NEW">Printer</paragraph>
<paragraph role="paragraph" id="par_idN105BB" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the printer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_PRINTERSETTINGS" id="bm_id7486190" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_PRINTERSETTINGS" id="bm_id7486190" localize="false"/>
<paragraph role="heading" id="par_idN105BE" xml-lang="en-US" level="3" l10n="NEW">Properties</paragraph>
<paragraph role="paragraph" id="par_idN105C2" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Changes the printer properties.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_PRINTALL" id="bm_id4834131" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_PRINTALL" id="bm_id4834131" localize="false"/>
<paragraph role="heading" id="par_idN105C5" xml-lang="en-US" level="3" l10n="NEW">Print all documents</paragraph>
<paragraph role="paragraph" id="par_idN105C9" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Prints documents for all recipients.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_PRINTNOW" id="bm_id6397595" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_PRINTNOW" id="bm_id6397595" localize="false"/>
<paragraph role="heading" id="par_idN105DA" xml-lang="en-US" level="3" l10n="NEW">Print Documents</paragraph>
<paragraph role="paragraph" id="par_idN105DE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Prints the mail merge documents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_SENDMAIL" id="bm_id508133" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SENDMAIL" id="bm_id508133" localize="false"/>
<paragraph role="heading" id="par_idN105E1" xml-lang="en-US" level="2" l10n="NEW">Send merged document as e-mail</paragraph>
<paragraph role="paragraph" id="par_idN105E5" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Sends the output as e-mail messages to all recipients.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_ListBox_DLG_MM_OUTPUT_PAGE_LB_MAILTO" id="bm_id5152745" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_MM_OUTPUT_PAGE:LB_MAILTO" id="bm_id5152745" localize="false"/>
<paragraph role="heading" id="par_idN105E8" xml-lang="en-US" level="3" l10n="NEW">To</paragraph>
<paragraph role="paragraph" id="par_idN105EC" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the database field that contains the e-mail address of the recipient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_COPYTO" id="bm_id3541673" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_COPYTO" id="bm_id3541673" localize="false"/>
<paragraph role="heading" id="par_idN105EF" xml-lang="en-US" level="3" l10n="NEW">Copy to</paragraph>
<paragraph role="paragraph" id="par_idN105F3" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_copyto.xhp">Copy To</link> dialog where you can specify one or more CC or BCC addresses.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_DLG_MM_OUTPUT_PAGE_ED_SUBJECT" id="bm_id5238196" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_MM_OUTPUT_PAGE:ED_SUBJECT" id="bm_id5238196" localize="false"/>
<paragraph role="heading" id="par_idN10600" xml-lang="en-US" level="3" l10n="NEW">Subject</paragraph>
<paragraph role="paragraph" id="par_idN10604" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the subject line for the e-mail messages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_ListBox_DLG_MM_OUTPUT_PAGE_LB_SENDAS" id="bm_id9405499" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_MM_OUTPUT_PAGE:LB_SENDAS" id="bm_id9405499" localize="false"/>
<paragraph role="heading" id="par_idN10607" xml-lang="en-US" level="3" l10n="NEW">Send as</paragraph>
<paragraph role="paragraph" id="par_idN1060B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the mail format for the e-mail messages.</ahelp></paragraph>
<paragraph role="note" id="par_idN1060E" xml-lang="en-US" l10n="NEW">The Plain text and HTML message formats are sent in the body of the message, whereas the *.odt, *.doc, and *.pdf formats are sent as attachments.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_SENDAS" id="bm_id2954496" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_SENDAS" id="bm_id2954496" localize="false"/>
<paragraph role="heading" id="par_idN10611" xml-lang="en-US" level="3" l10n="NEW">Properties</paragraph>
<paragraph role="paragraph" id="par_idN10615" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_emabod.xhp">E-Mail Message</link> dialog where you can enter the e-mail message for the mail merge files that are sent as attachments.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_DLG_MM_OUTPUT_PAGE_ED_ATTACHMENT" id="bm_id8253730" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_MM_OUTPUT_PAGE:ED_ATTACHMENT" id="bm_id8253730" localize="false"/>
<paragraph role="heading" id="par_idN10626" xml-lang="en-US" level="3" l10n="NEW">Name of the attachment</paragraph>
<paragraph role="paragraph" id="par_idN1062A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Shows the name of the attachment.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_SENDALL" id="bm_id8163090" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SENDALL" id="bm_id8163090" localize="false"/>
<paragraph role="heading" id="par_idN1062D" xml-lang="en-US" level="3" l10n="NEW">Send all documents</paragraph>
<paragraph role="paragraph" id="par_idN10631" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to send e-mails to all recipients.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_SENDDOCUMENTS" id="bm_id425122" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_SENDDOCUMENTS" id="bm_id425122" localize="false"/>
<paragraph role="heading" id="par_idN10642" xml-lang="en-US" level="3" l10n="NEW">Send Documents</paragraph>
<paragraph role="paragraph" id="par_idN10646" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to start sending e-mails.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN10649" xml-lang="en-US" l10n="NEW"><link href="text/swriter/01/mailmerge00.xhp" name="Mail Merge Wizard">Mail Merge Wizard</link></paragraph>
diff --git a/helpcontent2/source/text/swriter/01/mm_copyto.xhp b/helpcontent2/source/text/swriter/01/mm_copyto.xhp
index 059d3a9fcc..0b915fe3a5 100755
--- a/helpcontent2/source/text/swriter/01/mm_copyto.xhp
+++ b/helpcontent2/source/text/swriter/01/mm_copyto.xhp
@@ -42,10 +42,10 @@
<body>
<paragraph role="heading" id="par_idN10539" xml-lang="en-US" level="1" l10n="NEW">Copy To</paragraph>
<paragraph role="paragraph" id="par_idN1053D" xml-lang="en-US" l10n="NEW">Specify additional e-mail recipients for the <link href="text/swriter/01/mailmerge08.xhp">mail merge</link> document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_DLG_MM_COPYTO_ED_CC" id="bm_id2162236" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_MM_COPYTO:ED_CC" id="bm_id2162236" localize="false"/>
<paragraph role="heading" id="par_idN1054E" xml-lang="en-US" level="2" l10n="NEW">CC</paragraph>
<paragraph role="paragraph" id="par_idN10552" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the recipients of e-mail copies, separated by a semicolon (;).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_DLG_MM_COPYTO_ED_BCC" id="bm_id3037202" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_MM_COPYTO:ED_BCC" id="bm_id3037202" localize="false"/>
<paragraph role="heading" id="par_idN10555" xml-lang="en-US" level="2" l10n="NEW">BCC</paragraph>
<paragraph role="paragraph" id="par_idN10559" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the recipients of e-mail blind copies, separated by a semicolon (;).</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/swriter/01/mm_cusgrelin.xhp b/helpcontent2/source/text/swriter/01/mm_cusgrelin.xhp
index e823d8a46c..bd14819106 100755
--- a/helpcontent2/source/text/swriter/01/mm_cusgrelin.xhp
+++ b/helpcontent2/source/text/swriter/01/mm_cusgrelin.xhp
@@ -45,24 +45,24 @@
<bookmark xml-lang="en-US" branch="hid/HID_MM_CUSTOMFIELDS" id="bm_id8578142" localize="false"/>
<paragraph role="heading" id="par_idN10551" xml-lang="en-US" level="2" l10n="NEW">Salutation elements</paragraph>
<paragraph role="paragraph" id="par_idN10555" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a field and drag the field to the other list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_ImageButton_DLG_MM_CUSTOMIZEADDRESSBLOCK_IB_INSERTFIELD" id="bm_id5275734" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_INSERTFIELD" id="bm_id5275734" localize="false"/>
<paragraph role="heading" id="par_idN10558" xml-lang="en-US" level="2" l10n="NEW">&gt;</paragraph>
<paragraph role="paragraph" id="par_idN1055C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds the selected field from the list of salutation elements to the other list. You can add a field more than once.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_ImageButton_DLG_MM_CUSTOMIZEADDRESSBLOCK_IB_REMOVEFIELD" id="bm_id6546525" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_REMOVEFIELD" id="bm_id6546525" localize="false"/>
<paragraph role="heading" id="par_idN1055F" xml-lang="en-US" level="2" l10n="NEW">&lt;</paragraph>
<paragraph role="paragraph" id="par_idN10563" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Removes the selected field from the other list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_MultiLineEdit_DLG_MM_CUSTOMIZEADDRESSBLOCK_ED_DRAG" id="bm_id1746574" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MultiLineEdit:DLG_MM_CUSTOMIZEADDRESSBLOCK:ED_DRAG" id="bm_id1746574" localize="false"/>
<paragraph role="heading" id="par_idN10566" xml-lang="en-US" level="2" l10n="NEW">Drag salutation elements into the box below</paragraph>
<paragraph role="paragraph" id="par_idN1056A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Arrange the fields by drag-and-drop or use the arrow buttons.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_ComboBox_DLG_MM_CUSTOMIZEADDRESSBLOCK_CB_FIELD" id="bm_id8161564" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:DLG_MM_CUSTOMIZEADDRESSBLOCK:CB_FIELD" id="bm_id8161564" localize="false"/>
<paragraph role="heading" id="par_idN1056D" xml-lang="en-US" level="2" l10n="NEW">Customize salutation</paragraph>
<paragraph role="paragraph" id="par_idN10571" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a value from the list for the salutation and the punctuation mark fields.</ahelp></paragraph>
<paragraph role="heading" id="par_idN10574" xml-lang="en-US" level="2" l10n="NEW">Preview</paragraph>
<paragraph role="paragraph" id="par_idN10578" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays a preview of the first database record with the current salutation layout.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_ImageButton_DLG_MM_CUSTOMIZEADDRESSBLOCK_IB_UP" id="bm_id1669972" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw_ImageButton_DLG_MM_CUSTOMIZEADDRESSBLOCK_IB_LEFT" id="bm_id1744743" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw_ImageButton_DLG_MM_CUSTOMIZEADDRESSBLOCK_IB_RIGHT" id="bm_id1376384" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw_ImageButton_DLG_MM_CUSTOMIZEADDRESSBLOCK_IB_DOWN" id="bm_id7465132" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_UP" id="bm_id1669972" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_LEFT" id="bm_id1744743" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_RIGHT" id="bm_id1376384" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_DOWN" id="bm_id7465132" localize="false"/>
<paragraph role="heading" id="par_idN1057B" xml-lang="en-US" level="2" l10n="NEW">(Arrow Buttons)</paragraph>
<paragraph role="paragraph" id="par_idN1057F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select an item in the list and click an arrow button to move the item.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/swriter/01/mm_emabod.xhp b/helpcontent2/source/text/swriter/01/mm_emabod.xhp
index 7806a70466..33244a9a16 100755
--- a/helpcontent2/source/text/swriter/01/mm_emabod.xhp
+++ b/helpcontent2/source/text/swriter/01/mm_emabod.xhp
@@ -42,34 +42,34 @@
<body>
<paragraph role="heading" id="par_idN1053C" xml-lang="en-US" level="1" l10n="NEW">E-Mail Message</paragraph>
<paragraph role="paragraph" id="par_idN10540" xml-lang="en-US" l10n="NEW">Type the message and the salutation for files that you send as <link href="text/swriter/01/mailmerge08.xhp">e-mail</link> attachments.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/1435403279" id="bm_id1831110" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_DLG_MM_MAILBODY_CB_GREETINGLINE" id="bm_id1831110" localize="false"/>
<paragraph role="heading" id="par_idN10554" xml-lang="en-US" level="2" l10n="NEW">This e-mail should contain a salutation</paragraph>
<paragraph role="paragraph" id="par_idN10558" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds a salutation to the e-mail.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1435403266" id="bm_id6255073" localize="false"/>
+<!-- removed HID 1435403266 -->
<paragraph role="heading" id="par_idN1055B" xml-lang="en-US" level="3" l10n="NEW">Insert personalized salutation</paragraph>
<paragraph role="paragraph" id="par_idN1055F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds a personalized salutation. To use the default salutation, clear this check box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1435405827" id="bm_id8216193" localize="false"/>
+<!-- removed HID 1435405827 -->
<paragraph role="heading" id="par_idN10562" xml-lang="en-US" level="4" l10n="NEW">Female</paragraph>
<paragraph role="paragraph" id="par_idN10566" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the personalized greeting for a female recipient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1435406852" id="bm_id8684957" localize="false"/>
+<!-- removed HID 1435406852 -->
<paragraph role="heading" id="par_idN10569" xml-lang="en-US" level="4" l10n="NEW">New</paragraph>
<paragraph role="paragraph" id="par_idN1056D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_cusgrelin.xhp">Custom Salutation</link> dialog for a female recipient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1435405829" id="bm_id3004547" localize="false"/>
+<!-- removed HID 1435405829 -->
<paragraph role="heading" id="par_idN1057E" xml-lang="en-US" level="4" l10n="NEW">Male</paragraph>
<paragraph role="paragraph" id="par_idN10582" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the personalized greeting for a male recipient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1435406854" id="bm_id1132847" localize="false"/>
+<!-- removed HID 1435406854 -->
<paragraph role="heading" id="par_idN10585" xml-lang="en-US" level="4" l10n="NEW">New</paragraph>
<paragraph role="paragraph" id="par_idN10589" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_cusgrelin.xhp">Custom Salutation</link> dialog for a male recipient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1435405833" id="bm_id6285897" localize="false"/>
+<!-- removed HID 1435405833 -->
<paragraph role="heading" id="par_idN1059A" xml-lang="en-US" level="4" l10n="NEW">Field name</paragraph>
<paragraph role="paragraph" id="par_idN1059E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the field name of the address database field that contains the gender information.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1435406347" id="bm_id3717154" localize="false"/>
+<!-- removed HID 1435406347 -->
<paragraph role="heading" id="par_idN105A1" xml-lang="en-US" level="4" l10n="NEW">Field value</paragraph>
<paragraph role="paragraph" id="par_idN105A5" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the field value that indicates the gender of the recipient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1435406350" id="bm_id4054994" localize="false"/>
+<!-- removed HID 1435406350 -->
<paragraph role="heading" id="par_idN105A8" xml-lang="en-US" level="3" l10n="NEW">General salutation</paragraph>
<paragraph role="paragraph" id="par_idN105AC" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the default greeting to use if a personalized salutation cannot be created.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1435404831" id="bm_id495010" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_MULTILINEEDIT_DLG_MM_MAILBODY_MLE_BODY" id="bm_id495010" localize="false"/>
<paragraph role="heading" id="par_idN105AF" xml-lang="en-US" level="3" l10n="NEW">Write your message here</paragraph>
<paragraph role="paragraph" id="par_idN105B3" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the main text of the e-mail.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/swriter/01/mm_seladdblo.xhp b/helpcontent2/source/text/swriter/01/mm_seladdblo.xhp
index 82ec8d193e..78cdc0c158 100755
--- a/helpcontent2/source/text/swriter/01/mm_seladdblo.xhp
+++ b/helpcontent2/source/text/swriter/01/mm_seladdblo.xhp
@@ -44,24 +44,24 @@
<paragraph role="paragraph" id="par_idN1053D" xml-lang="en-US" l10n="NEW">Select, edit, or delete an address block layout for <link href="text/swriter/01/mailmerge03.xhp">mail merge</link>.</paragraph>
<paragraph role="heading" id="par_idN1054E" xml-lang="en-US" level="2" l10n="NEW">Select the address block which you want to use</paragraph>
<paragraph role="paragraph" id="par_idN10552" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the block in the list that you want to use for mail merge addresses, and click <emph>OK</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_SELECTADDRESSBLOCK_RB_NEVER" id="bm_id6604815" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_SELECTADDRESSBLOCK:RB_NEVER" id="bm_id6604815" localize="false"/>
<paragraph role="heading" id="par_idN10555" xml-lang="en-US" level="2" l10n="NEW">Never include country/region</paragraph>
<paragraph role="paragraph" id="par_idN10559" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Excludes country or regional information from the address block.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_SELECTADDRESSBLOCK_RB_ALWAYS" id="bm_id2571184" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_SELECTADDRESSBLOCK:RB_ALWAYS" id="bm_id2571184" localize="false"/>
<paragraph role="heading" id="par_idN1055C" xml-lang="en-US" level="2" l10n="NEW">Always include country/region</paragraph>
<paragraph role="paragraph" id="par_idN10560" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Includes country or regional information in the address block.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_SELECTADDRESSBLOCK_RB_DEPENDENT" id="bm_id6947538" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_SELECTADDRESSBLOCK:RB_DEPENDENT" id="bm_id6947538" localize="false"/>
<paragraph role="heading" id="par_idN10563" xml-lang="en-US" level="2" l10n="NEW">Only include country/region if it is not:</paragraph>
<paragraph role="paragraph" id="par_idN10567" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Only includes country or regional information in the address block if the value differs from the value that you enter in the text box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_DLG_MM_SELECTADDRESSBLOCK_ED_COUNTRY" id="bm_id7257606" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_MM_SELECTADDRESSBLOCK:ED_COUNTRY" id="bm_id7257606" localize="false"/>
<paragraph role="paragraph" id="par_idN10651" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the country/region string that shall not be printed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_SELECTADDRESSBLOCK_PB_NEW" id="bm_id1533249" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_SELECTADDRESSBLOCK:PB_NEW" id="bm_id1533249" localize="false"/>
<paragraph role="heading" id="par_idN1056A" xml-lang="en-US" level="2" l10n="NEW">New</paragraph>
<paragraph role="paragraph" id="par_idN1056E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_newaddblo.xhp">New Address Block</link> dialog where you can define a new address block layout.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_SELECTADDRESSBLOCK_PB_CUSTOMIZE" id="bm_id1784112" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_SELECTADDRESSBLOCK:PB_CUSTOMIZE" id="bm_id1784112" localize="false"/>
<paragraph role="heading" id="par_idN1057F" xml-lang="en-US" level="2" l10n="NEW">Edit</paragraph>
<paragraph role="paragraph" id="par_idN10583" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_newaddblo.xhp">New Address Block</link> dialog where you can edit the selected address block layout.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_SELECTADDRESSBLOCK_PB_DELETE" id="bm_id2646565" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_SELECTADDRESSBLOCK:PB_DELETE" id="bm_id2646565" localize="false"/>
<paragraph role="heading" id="par_idN10594" xml-lang="en-US" level="2" l10n="NEW">Delete</paragraph>
<paragraph role="paragraph" id="par_idN10598" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Deletes the selected address block layout.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/swriter/01/mm_seladdlis.xhp b/helpcontent2/source/text/swriter/01/mm_seladdlis.xhp
index 40a9f46a8a..9da06f6ea2 100755
--- a/helpcontent2/source/text/swriter/01/mm_seladdlis.xhp
+++ b/helpcontent2/source/text/swriter/01/mm_seladdlis.xhp
@@ -45,19 +45,19 @@
<bookmark xml-lang="en-US" branch="hid/HID_MM_ADDRESSLIST_TLB" id="bm_id119937" localize="false"/><comment>ufi: added help id for the table control, else the Help button does not work</comment>
<paragraph role="heading" id="par_idN10542" xml-lang="en-US" level="1" l10n="NEW">Select Address List</paragraph>
<paragraph role="paragraph" id="par_idN10549" xml-lang="en-US" l10n="NEW">Select the address list that you want to use for <link href="text/swriter/01/mailmerge03.xhp">mail merge</link>, then click <emph>OK</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_ADDRESSLISTDIALOG_PB_LOADLIST" id="bm_id7303689" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_ADDRESSLISTDIALOG:PB_LOADLIST" id="bm_id7303689" localize="false"/>
<paragraph role="heading" id="par_idN1055A" xml-lang="en-US" level="2" l10n="NEW">Add</paragraph>
<paragraph role="paragraph" id="par_idN1055E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the database file that contains the addresses that you want to use as an address list.</ahelp> If the file contains more than one table, the <link href="text/swriter/01/mm_seltab.xhp">Select Table</link> dialog opens.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_ADDRESSLISTDIALOG_PB_CREATELIST" id="bm_id584429" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_ADDRESSLISTDIALOG:PB_CREATELIST" id="bm_id584429" localize="false"/>
<paragraph role="heading" id="par_idN10573" xml-lang="en-US" level="2" l10n="NEW">Create</paragraph>
<paragraph role="paragraph" id="par_idN10589" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_newaddlis.xhp">New Address List</link> dialog, where you can create a new address list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_ADDRESSLISTDIALOG_PB_FILTER" id="bm_id4916837" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_ADDRESSLISTDIALOG:PB_FILTER" id="bm_id4916837" localize="false"/>
<paragraph role="heading" id="par_idN1059A" xml-lang="en-US" level="2" l10n="NEW">Filter</paragraph>
<paragraph role="paragraph" id="par_idN1059E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/02/12090100.xhp">Standard Filter</link> dialog , where you can apply filters to the address list to display the recipients that you want to see.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_ADDRESSLISTDIALOG_PB_EDIT" id="bm_id3753166" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_ADDRESSLISTDIALOG:PB_EDIT" id="bm_id3753166" localize="false"/>
<paragraph role="heading" id="par_idN105AF" xml-lang="en-US" level="2" l10n="NEW">Edit</paragraph>
<paragraph role="paragraph" id="par_idN105B3" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_newaddlis.xhp">New Address List</link> dialog, where you can edit the selected address list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_ADDRESSLISTDIALOG_PB_TABLE" id="bm_id7802667" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_ADDRESSLISTDIALOG:PB_TABLE" id="bm_id7802667" localize="false"/>
<paragraph role="heading" id="par_idN105C4" xml-lang="en-US" level="2" l10n="CHG">Change Table</paragraph>
<paragraph role="paragraph" id="par_idN105C8" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_seltab.xhp">Select Table</link> dialog, where you can select another table to use for mail merge.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/swriter/01/mm_seltab.xhp b/helpcontent2/source/text/swriter/01/mm_seltab.xhp
index 2c71242b5a..e98590158c 100755
--- a/helpcontent2/source/text/swriter/01/mm_seltab.xhp
+++ b/helpcontent2/source/text/swriter/01/mm_seltab.xhp
@@ -42,7 +42,7 @@
<body>
<bookmark xml-lang="en-US" branch="hid/HID_MM_SELECTDBTABLEDDIALOG_LISTBOX" id="bm_id6627094" localize="false"/><paragraph role="heading" id="par_idN10542" xml-lang="en-US" level="1" l10n="NEW">Select Table</paragraph>
<paragraph role="paragraph" id="par_idN10546" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the table that you want to use for <link href="text/swriter/01/mm_seladdlis.xhp">mail merge</link> addresses.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_SELECTDBTABLEDDIALOG_PB_PREVIEW" id="bm_id2926419" localize="false"/><paragraph role="heading" id="par_idN10557" xml-lang="en-US" level="2" l10n="NEW">Preview</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_SELECTDBTABLEDDIALOG:PB_PREVIEW" id="bm_id2926419" localize="false"/><paragraph role="heading" id="par_idN10557" xml-lang="en-US" level="2" l10n="NEW">Preview</paragraph>
<paragraph role="paragraph" id="par_idN1055B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <emph>Mail Merge Recipients</emph> dialog.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/selection_mode.xhp b/helpcontent2/source/text/swriter/01/selection_mode.xhp
index 91675558a6..b464caa505 100644
--- a/helpcontent2/source/text/swriter/01/selection_mode.xhp
+++ b/helpcontent2/source/text/swriter/01/selection_mode.xhp
@@ -41,13 +41,13 @@
</meta>
<body>
<section id="selection_mode">
-<bookmark xml-lang="en-US" branch="hid/sel_mode_id" id="bm_id6964323" localize="false"/><paragraph role="heading" id="hd_id4177678" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/selection_mode.xhp">Selection Mode</link></paragraph>
+<!-- removed HID sel_mode_id --><paragraph role="heading" id="hd_id4177678" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/selection_mode.xhp">Selection Mode</link></paragraph>
<paragraph role="paragraph" id="par_id2962126" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Choose the selection mode from the submenu: normal selection mode, or block selection mode.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/swriter/00/00000402.xhp#selection_mode"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/insert_normalid" id="bm_id5334025" localize="false"/><paragraph role="paragraph" id="par_id9816278" xml-lang="en-US" l10n="NEW"><ahelp hid=".">In normal selection mode, you can select multi-line text including the line ends.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/insert_id" id="bm_id5380108" localize="false"/><paragraph role="paragraph" id="par_id3097323" xml-lang="en-US" l10n="NEW"><ahelp hid=".">In block selection mode, you can select a rectangular block of text.</ahelp></paragraph>
+<!-- removed HID insert_normalid --><paragraph role="paragraph" id="par_id9816278" xml-lang="en-US" l10n="NEW"><ahelp hid=".">In normal selection mode, you can select multi-line text including the line ends.</ahelp></paragraph>
+<!-- removed HID insert_id --><paragraph role="paragraph" id="par_id3097323" xml-lang="en-US" l10n="NEW"><ahelp hid=".">In block selection mode, you can select a rectangular block of text.</ahelp></paragraph>
</body>
</helpdocument>