[Libreoffice-commits] .: 17 commits - helpcontent2/helpers helpcontent2/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Sep 28 00:49:50 PDT 2012


 helpcontent2/helpers/help_hid.lst                |  140 -----------------------
 helpcontent2/source/text/shared/01/01130000.xhp  |   39 ++----
 helpcontent2/source/text/shared/01/03010000.xhp  |   46 ++-----
 helpcontent2/source/text/shared/01/04100000.xhp  |   15 +-
 helpcontent2/source/text/shared/01/05020100.xhp  |   44 +++----
 helpcontent2/source/text/shared/01/05020200.xhp  |   66 +++++-----
 helpcontent2/source/text/shared/01/05020400.xhp  |   35 ++---
 helpcontent2/source/text/shared/01/05020500.xhp  |   60 ++++-----
 helpcontent2/source/text/shared/01/05020600.xhp  |   13 +-
 helpcontent2/source/text/shared/01/05150101.xhp  |    6 
 helpcontent2/source/text/swriter/01/04150000.xhp |   37 +++---
 helpcontent2/source/text/swriter/01/05120100.xhp |   10 -
 helpcontent2/source/text/swriter/01/05150101.xhp |   45 +++----
 helpcontent2/source/text/swriter/01/05190000.xhp |   21 +--
 helpcontent2/source/text/swriter/01/06040000.xhp |    4 
 helpcontent2/source/text/swriter/01/06090000.xhp |   46 +++----
 helpcontent2/source/text/swriter/01/06100000.xhp |   72 +++++------
 helpcontent2/source/text/swriter/01/06180000.xhp |   46 +++----
 18 files changed, 286 insertions(+), 459 deletions(-)

New commits:
commit 6c6eb4ce8adffd982e3b337bbad8582c1bf08944
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Sep 26 16:22:58 2012 +0100

    adapt insert character dialog helpids to .ui names
    
    Change-Id: Iec3a62c9636e0797ca3a5ecf67b135d0f99dd66a

diff --git a/helpcontent2/helpers/help_hid.lst b/helpcontent2/helpers/help_hid.lst
index adf7297..02ba6c3 100644
--- a/helpcontent2/helpers/help_hid.lst
+++ b/helpcontent2/helpers/help_hid.lst
@@ -8311,8 +8311,6 @@ svx_ListBox_RID_SVXDLG_BMPMASK_LB_2,3391950338,
 svx_ListBox_RID_SVXDLG_BMPMASK_LB_3,3391950339,
 svx_ListBox_RID_SVXDLG_BMPMASK_LB_4,3391950340,
 svx_ListBox_RID_SVXDLG_BMPMASK_LB_TRANS,3391950341,
-svx_ListBox_RID_SVXDLG_CHARMAP_LB_FONT,1237749260,
-svx_ListBox_RID_SVXDLG_CHARMAP_LB_SUBSET,1237749279,
 svx_ListBox_RID_SVXDLG_EDIT_MODULES_LB_EDIT_MODULES_LANGUAGE,1251200831,
 svx_ListBox_RID_SVXDLG_FONTWORK_CLB_SHADOW_COLOR,3386592769,
 svx_ListBox_RID_SVXDLG_GALLERY_THEMEID_LB_RESNAME,1243631105,
@@ -8753,7 +8751,6 @@ svx_PushButton_RID_SVXDLG_ADD_DATAITEM_PB_REQUIRED,1368855060,
 svx_PushButton_RID_SVXDLG_ADD_INSTANCE_PB_FILEPICKER,1368953359,
 svx_PushButton_RID_SVXDLG_ADD_SUBMISSION_PB_SUBMIT_REF,1368920595,
 svx_PushButton_RID_SVXDLG_BMPMASK_BTN_EXEC,3391951361,
-svx_PushButton_RID_SVXDLG_CHARMAP_BTN_DELETE,1237750292,
 svx_PushButton_RID_SVXDLG_EDIT_MODULES_PB_EDIT_MODULES_PRIO_BACK,1251201847,
 svx_PushButton_RID_SVXDLG_EDIT_MODULES_PB_EDIT_MODULES_PRIO_DOWN,1251201846,
 svx_PushButton_RID_SVXDLG_EDIT_MODULES_PB_EDIT_MODULES_PRIO_UP,1251201845,
diff --git a/helpcontent2/source/text/shared/01/04100000.xhp b/helpcontent2/source/text/shared/01/04100000.xhp
index 6de6f6a..077ac84 100644
--- a/helpcontent2/source/text/shared/01/04100000.xhp
+++ b/helpcontent2/source/text/shared/01/04100000.xhp
@@ -43,9 +43,8 @@
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="hid/.uno:InsertSymbol" id="bm_id1495830" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertSymbol" id="bm_id3153391" localize="false"/>
-<!-- removed HID SID_BULLET -->
 <bookmark xml-lang="en-US" branch="hid/.uno:Bullet" id="bm_id3146902" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/specialcharacters/SpecialCharactersDialog" id="bm_id3146903" localize="false"/>
 <paragraph role="heading" id="hd_id3152937" xml-lang="en-US" level="1" l10n="U" oldref="1">Special Character</paragraph>
 <paragraph role="paragraph" id="par_id3150838" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="sonder"><ahelp hid=".uno:Bullet">Inserts special characters from the installed fonts.</ahelp>
 </variable></paragraph>
@@ -53,20 +52,20 @@
   <embed href="text/shared/00/00000404.xhp#sonder"/>
 </section>
 <paragraph role="paragraph" id="par_id3152372" xml-lang="en-US" l10n="U" oldref="11">When you click a character in the <emph>Special Characters </emph>dialog, a preview and the corresponding numerical code for the character is displayed.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXDLG_CHARMAP:LB_FONT" id="bm_id3153910" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/specialcharacters/fontlb" id="bm_id3153910" localize="false"/>
 <paragraph role="heading" id="hd_id3151315" xml-lang="en-US" level="2" l10n="U" oldref="3">Font</paragraph>
-<paragraph role="paragraph" id="par_id3152924" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_CHARMAP:LB_FONT">Select a font to display the special characters that are associated with it.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXDLG_CHARMAP:LB_SUBSET" id="bm_id3147292" localize="false"/>
+<paragraph role="paragraph" id="par_id3152924" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="cui/ui/specialcharacters/fontlb">Select a font to display the special characters that are associated with it.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/specialcharacters/subsetlb" id="bm_id3147292" localize="false"/>
 <paragraph role="heading" id="hd_id3155555" xml-lang="en-US" level="2" l10n="U" oldref="19">Subset</paragraph>
-<paragraph role="paragraph" id="par_id3145090" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX_LISTBOX_RID_SVXDLG_CHARMAP_LB_SUBSET">Select a Unicode category for the current font.</ahelp> The special characters for the selected Unicode category are displayed in the character table.</paragraph>
+<paragraph role="paragraph" id="par_id3145090" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="cui/ui/specialcharacters/subsetlb">Select a Unicode category for the current font.</ahelp> The special characters for the selected Unicode category are displayed in the character table.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/CUI_HID_CHARMAP_CTL_SHOWSET" id="bm_id3147576" localize="false"/>
 <paragraph role="heading" id="hd_id3145071" xml-lang="en-US" level="2" l10n="U" oldref="5">Character Table</paragraph>
 <paragraph role="paragraph" id="par_id3154288" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_CHARMAP_CTL_SHOWSET">Click the special character(s) that you want to insert, and then click <emph>OK</emph>.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3154317" xml-lang="en-US" level="2" l10n="U" oldref="7">Characters</paragraph>
 <paragraph role="paragraph" id="par_id3152551" xml-lang="en-US" l10n="U" oldref="8">Displays the special characters that you have selected.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXDLG_CHARMAP:BTN_DELETE" id="bm_id3147089" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/specialcharacters/delete" id="bm_id3147089" localize="false"/>
 <paragraph role="heading" id="hd_id3155535" xml-lang="en-US" level="2" l10n="U" oldref="12">Delete</paragraph>
-<paragraph role="paragraph" id="par_id3147653" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_CHARMAP:BTN_DELETE">Clears the current selection of special characters that you want to insert.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3147653" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="cui/ui/specialcharacters/delete">Clears the current selection of special characters that you want to insert.</ahelp></paragraph>
 <section id="relatedtopics">
 <embed href="text/shared/guide/insert_specialchar.xhp#insert_specialchar"/>
 </section>
commit 516e34d25844fc45f4ad08bf61395c867f672826
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Sep 26 10:00:43 2012 +0100

    adapt sort helpids to .ui names
    
    Change-Id: Ie268f70bb21276a19119add5d3b9b7188879b547

diff --git a/helpcontent2/helpers/help_hid.lst b/helpcontent2/helpers/help_hid.lst
index 3c73b8b..adf7297 100644
--- a/helpcontent2/helpers/help_hid.lst
+++ b/helpcontent2/helpers/help_hid.lst
@@ -9062,10 +9062,6 @@ sw_CheckBox_DLG_MM_PREPAREMERGE_PAGE_CB_EXCLUDE,898270216,
 sw_CheckBox_DLG_MM_SERVERAUTHENTICATION_CB_AUTHENTICATION,1427145778,
 sw_CheckBox_DLG_ROW_HEIGHT_CB_AUTOHEIGHT,1425245186,
 sw_CheckBox_DLG_SEQUENCE_OPTION_CB_APPLYBAS,1418003486,
-sw_CheckBox_DLG_SORTING_CB_CASE,1428767782,
-sw_CheckBox_DLG_SORTING_CB_KEY1,1428767749,
-sw_CheckBox_DLG_SORTING_CB_KEY2,1428767752,
-sw_CheckBox_DLG_SORTING_CB_KEY3,1428767755,
 sw_CheckBox_MD_EDIT_REGION_CB_DDE,1405830145,
 sw_CheckBox_MD_EDIT_REGION_CB_PASSWD,1405830153,
 sw_CheckBox_TP_COLUMN_CB_AUTO_WIDTH,877872132,
@@ -9256,7 +9252,6 @@ sw_Edit_DLG_RENAME_GLOS_ED_OS,1428867078,
 sw_Edit_DLG_RENAME_XNAMED_ED_NEW_NAME,1415972866,
 sw_Edit_DLG_SAVE_LABEL_ED_TYPE,1446643717,
 sw_Edit_DLG_SEQUENCE_OPTION_ED_SEPARATOR,1418004499,
-sw_Edit_DLG_SORTING_ED_TABCH,1428768791,
 sw_Edit_MD_EDIT_REGION_ED_CONDITION,1405831181,
 sw_Edit_MD_EDIT_REGION_ED_FILE,1405831184,
 sw_Edit_MD_EDIT_REGION_ED_RANAME,1405831187,
@@ -9417,10 +9412,6 @@ sw_ListBox_DLG_SEL_GLOS_LB_GLOS,1436749313,
 sw_ListBox_DLG_SEQUENCE_OPTION_LB_CHARSTYLE,1418006045,
 sw_ListBox_DLG_SEQUENCE_OPTION_LB_LEVEL,1418006033,
 sw_ListBox_DLG_SEQUENCE_OPTION_LB_ORDER,1418006049,
-sw_ListBox_DLG_SORTING_DLB_KEY1,1428770311,
-sw_ListBox_DLG_SORTING_DLB_KEY2,1428770314,
-sw_ListBox_DLG_SORTING_DLB_KEY3,1428770317,
-sw_ListBox_DLG_SORTING_LB_LANG,1428770340,
 sw_ListBox_TP_COLUMN_LB_POSITION,877874726,
 sw_ListBox_TP_COLUMN_LB_STYLE,877874722,
 sw_ListBox_TP_COLUMN_LB_TEXTDIRECTION,877874749,
@@ -9646,9 +9637,6 @@ sw_NumericField_DLG_PAGEPREVIEW_PRINTOPTIONS_NF_COLS,1411291141,
 sw_NumericField_DLG_PAGEPREVIEW_PRINTOPTIONS_NF_ROWS,1411291139,
 sw_NumericField_DLG_PAGEPREVIEW_ZOOM_ED_COL,1411274756,
 sw_NumericField_DLG_PAGEPREVIEW_ZOOM_ED_ROW,1411274757,
-sw_NumericField_DLG_SORTING_ED_KEY1,1428772870,
-sw_NumericField_DLG_SORTING_ED_KEY2,1428772873,
-sw_NumericField_DLG_SORTING_ED_KEY3,1428772876,
 sw_NumericField_TP_COLUMN_ED_NUMBER,877877250,
 sw_NumericField_TP_DROPCAPS_FLD_DROPCAPS,877828098,
 sw_NumericField_TP_DROPCAPS_FLD_LINES,877828100,
@@ -9744,7 +9732,6 @@ sw_PushButton_DLG_MM_SELECTADDRESSBLOCK_PB_NEW,1435324949,
 sw_PushButton_DLG_MM_SELECTDBTABLEDDIALOG_PB_PREVIEW,1435210243,
 sw_PushButton_DLG_MM_TESTACCOUNTSETTINGS_PB_STOP,1427132964,
 sw_PushButton_DLG_PAGEPREVIEW_PRINTOPTIONS_PB_STANDARD,1411289624,
-sw_PushButton_DLG_SORTING_PB_DELIM,1428771362,
 sw_PushButton_DLG_SYNC_BTN_BTN_SYNC,1983500820,
 sw_PushButton_MD_EDIT_REGION_CB_DISMISS,1405833730,
 sw_PushButton_MD_EDIT_REGION_PB_FILE,1405833768,
@@ -9844,16 +9831,6 @@ sw_RadioButton_DLG_MM_SERVERAUTHENTICATION_RB_SEP_AUTHENTICATION,1427145267,
 sw_RadioButton_DLG_MM_SERVERAUTHENTICATION_RB_SMPTAFTERPOP,1427145268,
 sw_RadioButton_DLG_PAGEPREVIEW_PRINTOPTIONS_RB_LANDSCAPE,1411285528,
 sw_RadioButton_DLG_PAGEPREVIEW_PRINTOPTIONS_RB_PORTRAIT,1411285529,
-sw_RadioButton_DLG_SORTING_RB_COL,1428767247,
-sw_RadioButton_DLG_SORTING_RB_DN,1428767251,
-sw_RadioButton_DLG_SORTING_RB_DN2,1428767262,
-sw_RadioButton_DLG_SORTING_RB_DN3,1428767264,
-sw_RadioButton_DLG_SORTING_RB_ROW,1428767248,
-sw_RadioButton_DLG_SORTING_RB_TAB,1428767253,
-sw_RadioButton_DLG_SORTING_RB_TABCH,1428767254,
-sw_RadioButton_DLG_SORTING_RB_UP,1428767250,
-sw_RadioButton_DLG_SORTING_RB_UP2,1428767261,
-sw_RadioButton_DLG_SORTING_RB_UP3,1428767263,
 sw_RadioButton_TP_ENDNOTEOPTION_RB_POS_CHAPTER,881148418,
 sw_RadioButton_TP_ENDNOTEOPTION_RB_POS_PAGE,881148417,
 sw_RadioButton_TP_ENV_PRT_BTN_BOTTOM,909672968,
diff --git a/helpcontent2/source/text/swriter/01/06100000.xhp b/helpcontent2/source/text/swriter/01/06100000.xhp
index f5da8b8..4757281 100644
--- a/helpcontent2/source/text/swriter/01/06100000.xhp
+++ b/helpcontent2/source/text/swriter/01/06100000.xhp
@@ -47,6 +47,7 @@
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/.uno:SortDialog" id="bm_id849221" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:TableSort" id="bm_id6670125" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/sw/ui/sortdialog/SortDialog" id="bm_id6670125" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3149353" role="heading" level="1" l10n="U" oldref="1">Sort</paragraph>
       <paragraph xml-lang="en-US" id="par_id3150015" role="paragraph" l10n="CHG" oldref="2"><variable id="sort"><ahelp hid=".uno:SortDialog">Sorts the selected paragraphs or table rows alphabetically or numerically.</ahelp> You can define up to three sort keys as well as combine alphanumeric and numeric sort keys.
 </variable></paragraph>
@@ -54,68 +55,68 @@
          <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/modules/sw/ui/sortdialog/key1" id="bm_id3153926" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/sw/ui/sortdialog/key2" id="bm_id3166462" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/sw/ui/sortdialog/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"/>
+      <paragraph xml-lang="en-US" id="par_id3147170" role="paragraph" l10n="U" oldref="5"><ahelp hid="modules/sw/ui/sortdialog/key3">Specifies additional sorting criteria. You can also combine sort keys.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/sw/ui/sortdialog/colsb1" id="bm_id3156318" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/sw/ui/sortdialog/colsb2" id="bm_id3156322" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/sw/ui/sortdialog/colsb3" 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"/>
+      <paragraph xml-lang="en-US" id="par_id3154644" role="paragraph" l10n="CHG" oldref="7"><ahelp hid="modules/sw/ui/sortdialog/colsb3">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/modules/sw/ui/sortdialog/typelb1" id="bm_id3149286" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/sw/ui/sortdialog/typelb2" id="bm_id3149289" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/sw/ui/sortdialog/typelb3" 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="par_id3149752" role="paragraph" l10n="U" oldref="10"><ahelp hid="modules/sw/ui/sortdialog/typelb3">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"/>
-<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/modules/sw/ui/sortdialog/up1" id="bm_id3147506" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/sw/ui/sortdialog/up2" id="bm_id3147509" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/sw/ui/sortdialog/up3" id="bm_id3147513" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3154270" role="paragraph" l10n="U" oldref="18"><ahelp hid="modules/sw/ui/sortdialog/up3">Sorts in ascending order, (for example, 1, 2, 3 or a, b, c).</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/sw/ui/sortdialog/down1" id="bm_id3154101" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/sw/ui/sortdialog/down2" id="bm_id3154104" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/sw/ui/sortdialog/down3" 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="par_id3152946" role="paragraph" l10n="U" oldref="20"><ahelp hid="modules/sw/ui/sortdialog/down3">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/modules/sw/ui/sortdialog/columns" 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"/>
+      <paragraph xml-lang="en-US" id="par_id3150973" role="paragraph" l10n="U" oldref="13"><ahelp hid="modules/sw/ui/sortdialog/columns">Sorts the columns in the table according to the current sort options.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/sw/ui/sortdialog/rows" 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="par_id3153677" role="paragraph" l10n="U" oldref="15"><ahelp hid="modules/sw/ui/sortdialog/rows">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/modules/sw/ui/sortdialog/tabs" 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"/>
+      <paragraph xml-lang="en-US" id="par_id3155902" role="paragraph" l10n="U" oldref="24"><ahelp hid="modules/sw/ui/sortdialog/tabs">If the selected paragraphs correspond to a list separated by tabs, select this option.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/sw/ui/sortdialog/character" id="bm_id3154201" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/sw/ui/sortdialog/separator" 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"/>
+      <paragraph xml-lang="en-US" id="par_id3159196" role="paragraph" l10n="U" oldref="26"><ahelp hid="modules/sw/ui/sortdialog/separator">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/modules/sw/ui/sortdialog/delimpb" 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"/>
+      <paragraph xml-lang="en-US" id="par_id3155178" role="paragraph" l10n="U" oldref="32"><ahelp hid="modules/sw/ui/sortdialog/delimpb">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/modules/sw/ui/sortdialog/langlb" 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"/>
+      <paragraph xml-lang="en-US" id="par_id3151252" role="paragraph" l10n="U" oldref="34"><ahelp hid="modules/sw/ui/sortdialog/langlb">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/modules/sw/ui/sortdialog/matchcase" 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>
+      <paragraph xml-lang="en-US" id="par_id3154838" role="paragraph" l10n="CHG" oldref="36"><ahelp hid="modules/sw/ui/sortdialog/matchcase">Distinguishes between uppercase and lowercase letters when you sort a table. For Asian languages special handling applies.</ahelp></paragraph>
       <paragraph xml-lang="en-US" id="par_idN10895" role="note" l10n="NEW">For Asian languages, select <emph>Match case </emph>to apply multi-level collation. In the multi-level collation, the primitive forms of the entries are first compared with the cases of the forms and diacritics ignored. If the forms are the same, the diacritics of the forms are compared. If the forms are still the same, the cases, character widths, and Japanese Kana differences of the forms are compared.<comment>UFI: see #112590# and #112507#</comment></paragraph>
    </body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
commit 95e01f866feaa4c91cdc3f32ad77affbb5872c52
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 25 13:47:17 2012 +0100

    adapt zoom helpids to .ui names
    
    Change-Id: I01743d55f302015bb9a2085f75b3bb9467f97e63

diff --git a/helpcontent2/helpers/help_hid.lst b/helpcontent2/helpers/help_hid.lst
index 80c9eca..3c73b8b 100644
--- a/helpcontent2/helpers/help_hid.lst
+++ b/helpcontent2/helpers/help_hid.lst
@@ -7955,7 +7955,6 @@ svx_CheckBox_RID_SVXDLG_SECURITY_OPTIONS_CB_REMOVEINFO,1242498070,
 svx_CheckBox_RID_SVXDLG_SECURITY_OPTIONS_CB_SAVESENDDOCS,1242498061,
 svx_CheckBox_RID_SVXDLG_SECURITY_OPTIONS_CB_SIGNDOCS,1242498063,
 svx_CheckBox_RID_SVXDLG_SPELLCHECK_CB_CHECK_GRAMMAR,2311849014,
-svx_CheckBox_RID_SVXDLG_ZOOM_CHK_BOOK,1237582874,
 svx_CheckBox_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_ACCESSIBILITY_TOOL,704807947,
 svx_CheckBox_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_ANIMATED_GRAPHICS,704807943,
 svx_CheckBox_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_ANIMATED_TEXTS,704807944,
@@ -8463,8 +8462,6 @@ svx_MetricField_RID_SVXDLG_FONTWORK_MTR_FLD_DISTANCE,3386595841,
 svx_MetricField_RID_SVXDLG_FONTWORK_MTR_FLD_SHADOW_X,3386595843,
 svx_MetricField_RID_SVXDLG_FONTWORK_MTR_FLD_SHADOW_Y,3386595844,
 svx_MetricField_RID_SVXDLG_FONTWORK_MTR_FLD_TEXTSTART,3386595842,
-svx_MetricField_RID_SVXDLG_ZOOM_ED_COLUMNS,1237588505,
-svx_MetricField_RID_SVXDLG_ZOOM_ED_USER,1237588500,
 svx_MetricField_RID_SVXFLOAT_3D_MTR_BACKSCALE,3388496416,
 svx_MetricField_RID_SVXFLOAT_3D_MTR_DEPTH,3388496420,
 svx_MetricField_RID_SVXFLOAT_3D_MTR_DISTANCE,3388496436,
@@ -8903,14 +8900,6 @@ svx_RadioButton_RID_SVXDLG_SEARCHFORM_RB_SEARCHFORTEXT,1368769027,
 svx_RadioButton_RID_SVXDLG_SEARCHFORM_RB_SINGLEFIELD,1368769026,
 svx_RadioButton_RID_SVXDLG_SEARCH_RB_CALC_COLUMNS,2311651898,
 svx_RadioButton_RID_SVXDLG_SEARCH_RB_CALC_ROWS,2311651897,
-svx_RadioButton_RID_SVXDLG_ZOOM_BTN_100,1237582354,
-svx_RadioButton_RID_SVXDLG_ZOOM_BTN_AUTOMATIC,1237582358,
-svx_RadioButton_RID_SVXDLG_ZOOM_BTN_COLUMNS,1237582360,
-svx_RadioButton_RID_SVXDLG_ZOOM_BTN_OPTIMAL,1237582351,
-svx_RadioButton_RID_SVXDLG_ZOOM_BTN_PAGE_WIDTH,1237582353,
-svx_RadioButton_RID_SVXDLG_ZOOM_BTN_SINGLE,1237582359,
-svx_RadioButton_RID_SVXDLG_ZOOM_BTN_USER,1237582355,
-svx_RadioButton_RID_SVXDLG_ZOOM_BTN_WHOLE_PAGE,1237582352,
 svx_RadioButton_RID_SVXPAGE_ALIGN_PARAGRAPH_BTN_CENTERALIGN,703775264,
 svx_RadioButton_RID_SVXPAGE_ALIGN_PARAGRAPH_BTN_JUSTIFYALIGN,703775265,
 svx_RadioButton_RID_SVXPAGE_ALIGN_PARAGRAPH_BTN_LEFTALIGN,703775262,
diff --git a/helpcontent2/source/text/shared/01/03010000.xhp b/helpcontent2/source/text/shared/01/03010000.xhp
index 13d0204..d9bf5b9 100644
--- a/helpcontent2/source/text/shared/01/03010000.xhp
+++ b/helpcontent2/source/text/shared/01/03010000.xhp
@@ -44,7 +44,7 @@
          <bookmark_value>screen; scaling</bookmark_value>
          <bookmark_value>pages; scaling</bookmark_value>
 </bookmark><comment>mw deleted "scaling;"</comment>
-<bookmark xml-lang="en-US" branch="hid/.uno:Zoom" id="bm_id2031101" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/zoomdialog/ZoomDialog" id="bm_id2031101" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:Zoom" id="bm_id3153321" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3154682" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/03010000.xhp">Zoom & View Layout</link></paragraph>
          <paragraph xml-lang="en-US" id="par_id3149578" role="paragraph" l10n="U" oldref="2"><variable id="massstabtext"><ahelp hid=".uno:Zoom">Reduces or enlarges the screen display of %PRODUCTNAME.</ahelp>
@@ -56,66 +56,49 @@
       <paragraph xml-lang="en-US" id="par_id3149655" role="note" l10n="CHG" oldref="26">Zooming is handled differently on Unix, Linux, and Windows platforms. A document saved with a 100% zoom factor in Windows is displayed at a larger zoom factor on Unix/Linux platforms. To change the zoom factor, double-click or right-click the percentage value on the <emph>Status</emph> bar, and select the zoom factor that you want.</paragraph>
       <paragraph xml-lang="en-US" id="hd_id3149669" role="heading" level="2" l10n="U" oldref="3">Zoom factor</paragraph>
       <paragraph xml-lang="en-US" id="par_id3154389" role="paragraph" l10n="CHG" oldref="4">Set the zoom factor at which to display the current document and all documents of the same type that you open thereafter.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_ZOOM:BTN_OPTIMAL" id="bm_id3145606" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/zoomdialog/optimal" id="bm_id3145606" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_OPTIMAL" id="bm_id3150498" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3153351" role="heading" level="2" l10n="U"
                  oldref="20">Optimal</paragraph>
       <paragraph xml-lang="en-US" id="par_id3144760" role="paragraph" l10n="U" oldref="21"><ahelp hid="HID_MNU_ZOOM_OPTIMAL"><switchinline select="appl"><caseinline select="CALC">Resizes the display to fit the width of the selected cell area at the moment the command is started.
 </caseinline><defaultinline>Resizes the display to fit the width of the text in the document at .</defaultinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_ZOOM:BTN_WHOLE_PAGE" id="bm_id3150359" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/zoomdialog/fitwandh" id="bm_id3150359" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_WHOLE_PAGE" id="bm_id3150358" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3151210" role="heading" level="2" l10n="CHG"
                  oldref="22">Fit width and height</paragraph>
       <paragraph xml-lang="en-US" id="par_id3150543" role="paragraph" l10n="U" oldref="25"><ahelp hid="HID_MNU_ZOOM_WHOLE_PAGE"><switchinline select="appl"><caseinline select="CALC">Resizes the display to fit the width and height of the selected cell area at the moment the command is started.
 </caseinline><defaultinline>Displays the entire page on your screen.</defaultinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_ZOOM:BTN_PAGE_WIDTH" id="bm_id3148797" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/zoomdialog/fitw" id="bm_id3148797" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_PAGE_WIDTH" id="bm_id3154140" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3152771" role="heading" level="2" l10n="CHG"
                  oldref="24">Fit width</paragraph>
       <paragraph xml-lang="en-US" id="par_id3143231" role="paragraph" l10n="U" oldref="23"><ahelp hid="HID_MNU_ZOOM_PAGE_WIDTH">Displays the complete width of the document page. The top and bottom edges of the page may not be visible.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_200" id="bm_id3156280" localize="false"/>
-<!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_200 -->
-<bookmark xml-lang="en-US" branch="hid/SID_VIEW200" id="bm_id4566280" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id3159151" role="paragraph" l10n="CHG" oldref="6"><ahelp hid="." visibility="hidden">Displays the document at two times its actual size.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_150" id="bm_id3148676" localize="false"/>
-<!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_150 -->
-<paragraph xml-lang="en-US" id="par_id3145173" role="paragraph" l10n="CHG" oldref="8"><ahelp hid="." visibility="hidden">Displays the document at one and a half times its actual size.</ahelp></paragraph>
       <section id="hdrt">
 <bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_100" id="bm_id3149560" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:View100" id="bm_id3159252" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_ZOOM:BTN_100" id="bm_id051420080349501" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/zoomdialog/100pc" id="bm_id051420080349501" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3153106" role="heading" level="2" l10n="U" oldref="9">100 %</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3147353" role="paragraph" l10n="U" oldref="10"><ahelp hid="SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_100">Displays the document at its actual size.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147353" role="paragraph" l10n="U" oldref="10"><ahelp hid="cui/ui/zoomdialog/100pc">Displays the document at its actual size.</ahelp></paragraph>
       </section>
-<bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_75" id="bm_id3159199" localize="false"/>
-<!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_75 -->
-<paragraph xml-lang="en-US" id="par_id3152791" role="paragraph" l10n="CHG" oldref="12"><ahelp hid="." visibility="hidden">Displays the document at 75% of its actual size.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_50" id="bm_id3150488" localize="false"/>
-<!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_50 -->
-<bookmark xml-lang="en-US" branch="hid/SID_VIEW050" id="bm_id765488" localize="false"/>
-
-<paragraph xml-lang="en-US" id="par_id3156005" role="paragraph" l10n="CHG" oldref="14"><ahelp hid="." visibility="hidden">Displays the document at half of its actual size.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_ZOOM:BTN_USER" id="bm_id3147478" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXDLG_ZOOM:ED_USER" id="bm_id3151352" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXDLG_ZOOM_ED_USER" id="bm_id1551561" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_ZOOM_BTN_USER" id="bm_id2212897" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/zoomdialog/variable" id="bm_id3147478" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/zoomdialog/zoomsb" id="bm_id3151352" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3153191" role="heading" level="2" l10n="U"
                  oldref="15">Variable</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3159125" role="paragraph" l10n="CHG" oldref="16"><ahelp hid="SVX:METRICFIELD:RID_SVXDLG_ZOOM:ED_USER">Enter the zoom factor at which you want to display the document. Enter a percentage in the box.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3159125" role="paragraph" l10n="CHG" oldref="16"><ahelp hid="cui/ui/zoomdialog/zoomsb">Enter the zoom factor at which you want to display the document. Enter a percentage in the box.</ahelp></paragraph>
       <paragraph xml-lang="en-US" id="hd_id7319864" role="heading" level="2" l10n="NEW">View layout</paragraph>
       <paragraph xml-lang="en-US" id="par_id3423871" role="paragraph" l10n="NEW">For text documents, you can set the view layout. Reduce the zoom factor to see the effects of different view layout settings.<comment>for this doc or all docs? answer: it's the same as before for the zoom factor.</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_ZOOM_BTN_AUTOMATIC" id="bm_id2504654" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/zoomdialog/automatic" id="bm_id2504654" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3818475" role="heading" level="2" l10n="NEW">Automatic</paragraph>
       <paragraph xml-lang="en-US" id="par_id3187353" role="paragraph" l10n="NEW"><ahelp hid=".">The automatic view layout displays pages side by side, as many as the zoom factor allows.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_ZOOM_BTN_SINGLE" id="bm_id5292519" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/zoomdialog/singlepage" id="bm_id5292519" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id8455153" role="heading" level="2" l10n="NEW">Single page</paragraph>
       <paragraph xml-lang="en-US" id="par_id9912411" role="paragraph" l10n="NEW"><ahelp hid=".">The single page view layout displays pages beneath each other, but never side by side.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_ZOOM_BTN_COLUMNS" id="bm_id3984496" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXDLG_ZOOM_ED_COLUMNS" id="bm_id9693899" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/zoomdialog/columns" id="bm_id3984496" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/zoomdialog/columnssb" id="bm_id9693899" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id9204992" role="heading" level="2" l10n="NEW">Columns</paragraph>
       <paragraph xml-lang="en-US" id="par_id1993774" role="paragraph" l10n="NEW"><ahelp hid=".">In columns view layout you see pages in a given number of columns side by side. Enter the number of columns.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_ZOOM_CHK_BOOK" id="bm_id8689230" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/zoomdialog/bookmode" id="bm_id8689230" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id2949919" role="heading" level="2" l10n="NEW">Book mode</paragraph>
       <paragraph xml-lang="en-US" id="par_id2355113" role="paragraph" l10n="NEW"><ahelp hid=".">In book mode view layout you see two pages side by side as in an open book. The first page is a right page with an odd page number.</ahelp></paragraph>
    </body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
commit 2f3421518d755f0cd7ef122264d13b8d4252fdb3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 25 12:15:38 2012 +0100

    adapt string input dialog to new layout help ids
    
    Change-Id: Ie43a6d2dddf0f7db6ff977312fa2c6f93d49e373

diff --git a/helpcontent2/helpers/help_hid.lst b/helpcontent2/helpers/help_hid.lst
index c49cb75..80c9eca 100644
--- a/helpcontent2/helpers/help_hid.lst
+++ b/helpcontent2/helpers/help_hid.lst
@@ -4001,7 +4001,6 @@ HID_SVX_TP_DOCRECOVERY_RECOVER,40032,
 HID_SVX_TP_DOCRECOVERY_SAVE,40030,
 HID_SVX_TP_ERR_REP_SEND,40035,
 HID_SVX_TP_ERR_REP_WELCOME,40034,
-HID_SWDLG_STRINPUT,54276,
 HID_SW_SORT_POSITION,53054,
 HID_SYNC_BTN,53055,
 HID_TABDESIGN_BACKGROUND,38884,
@@ -9269,7 +9268,6 @@ sw_Edit_DLG_RENAME_XNAMED_ED_NEW_NAME,1415972866,
 sw_Edit_DLG_SAVE_LABEL_ED_TYPE,1446643717,
 sw_Edit_DLG_SEQUENCE_OPTION_ED_SEPARATOR,1418004499,
 sw_Edit_DLG_SORTING_ED_TABCH,1428768791,
-sw_Edit_DLG_SWDLG_STRINPUT_ED_INPUT,1425344513,
 sw_Edit_MD_EDIT_REGION_ED_CONDITION,1405831181,
 sw_Edit_MD_EDIT_REGION_ED_FILE,1405831184,
 sw_Edit_MD_EDIT_REGION_ED_RANAME,1405831187,
diff --git a/helpcontent2/source/text/shared/01/05150101.xhp b/helpcontent2/source/text/shared/01/05150101.xhp
index 62eaca0..72d9c0f 100644
--- a/helpcontent2/source/text/shared/01/05150101.xhp
+++ b/helpcontent2/source/text/shared/01/05150101.xhp
@@ -38,10 +38,8 @@
 </history>
 </meta>
 <body>
-  
-  
   <paragraph role="heading" level="1" id="hd_id3154841" l10n="U" xml-lang="en-US" oldref="1">Add AutoFormat</paragraph>
-  <bookmark branch="hid/sw:Edit:DLG_SWDLG_STRINPUT:ED_INPUT" xml-lang="en-US" id="bm_id3150278"/><paragraph role="heading" level="2" id="hd_id3154812" l10n="U" xml-lang="en-US" oldref="2">Name</paragraph>
-  <paragraph l10n="U" role="paragraph" id="par_id3153391" xml-lang="en-US" oldref="3"><ahelp visibility="visible" hid="SW:EDIT:DLG_SWDLG_STRINPUT:ED_INPUT">Enter a name for the new AutoFormat, and then click<emph> OK</emph>.</ahelp></paragraph>
+  <bookmark branch="hid/modules/swriter/ui/stringinput/edit" xml-lang="en-US" id="bm_id3150278"/><paragraph role="heading" level="2" id="hd_id3154812" l10n="U" xml-lang="en-US" oldref="2">Name</paragraph>
+  <paragraph l10n="U" role="paragraph" id="par_id3153391" xml-lang="en-US" oldref="3"><ahelp visibility="visible" hid="modules/swriter/ui/stringinput/edit">Enter a name for the new AutoFormat, and then click<emph> OK</emph>.</ahelp></paragraph>
  </body>
 </helpdocument>
commit be298a1b346acc543c2a6586a719e2f49581c9b4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 25 11:42:27 2012 +0100

    update autoformat table help ids for .ui conversion
    
    Change-Id: I59769b7f951f2d1c9973a50a9927c883c5715b20

diff --git a/helpcontent2/helpers/help_hid.lst b/helpcontent2/helpers/help_hid.lst
index 84bbc09..c49cb75 100644
--- a/helpcontent2/helpers/help_hid.lst
+++ b/helpcontent2/helpers/help_hid.lst
@@ -798,7 +798,6 @@ HID_AUTOCORR_HELP_SETINETATTR,34116,
 HID_AUTOCORR_HELP_WORD,34099,
 HID_AUTOCORR_HELP_WORDENEMDASH,34107,
 HID_AUTOCORR_LANGUAGE,35091,
-HID_AUTOFMT_TABLE,54275,
 HID_AUTOFORMAT_ACCEPT,54854,
 HID_AUTOFORMAT_CLB,52827,
 HID_AUTOFORMAT_CLOSE,52834,
@@ -9050,11 +9049,6 @@ svx_TriStateBox_RID_SVXPAGE_TEXTATTR_TSB_FIT_TO_SIZE,703219203,
 svx_TriStateBox_RID_SVXPAGE_TEXTATTR_TSB_FULL_WIDTH,703219204,
 svx_TriStateBox_RID_SVXPAGE_TEXTATTR_TSB_WORDWRAP_TEXT,703219206,
 sw_CheckBox_DLG_AP_INSERT_DB_SEL_CB_TABLE_HEADON,1435042844,
-sw_CheckBox_DLG_AUTOFMT_TABLE_BTN_ALIGNMENT,1425327129,
-sw_CheckBox_DLG_AUTOFMT_TABLE_BTN_BORDER,1425327125,
-sw_CheckBox_DLG_AUTOFMT_TABLE_BTN_FONT,1425327127,
-sw_CheckBox_DLG_AUTOFMT_TABLE_BTN_NUMFORMAT,1425327124,
-sw_CheckBox_DLG_AUTOFMT_TABLE_BTN_PATTERN,1425327128,
 sw_CheckBox_DLG_BREAK_CB_PAGENUM,1412973575,
 sw_CheckBox_DLG_GLOSSARY_CB_FILE_REL,1428636740,
 sw_CheckBox_DLG_GLOSSARY_CB_INSERT_TIP,1428636677,
@@ -9412,7 +9406,6 @@ sw_ListBox_DLG_AP_INSERT_DB_SEL_LB_TXT_DB_COLUMN,1435045391,
 sw_ListBox_DLG_ASCII_FILTER_LB_CHARSET,1404849667,
 sw_ListBox_DLG_ASCII_FILTER_LB_FONT,1404849669,
 sw_ListBox_DLG_ASCII_FILTER_LB_LANGUAGE,1404849671,
-sw_ListBox_DLG_AUTOFMT_TABLE_LB_FORMAT,1425329665,
 sw_ListBox_DLG_BIB_BASE_LB_PATH,1428721160,
 sw_ListBox_DLG_BREAK_LB_COLL,1412976133,
 sw_ListBox_DLG_CAPTION_BOX_FORMAT,1417989639,
@@ -9641,7 +9634,6 @@ sw_ModalDialog_DLG_DBSELECTION,1435009024,
 sw_ModalDialog_DLG_INS_FOOTNOTE,1428652032,
 sw_ModalDialog_DLG_JAVAEDIT,1419608064,
 sw_ModalDialog_DLG_MAILMERGEWIZARD,1435058176,
-sw_MoreButton_DLG_AUTOFMT_TABLE_BTN_MORE,1425338984,
 sw_MultiLineEdit_DLG_AP_INSERT_DB_SEL_ED_DB_TEXT,1435044369,
 sw_MultiLineEdit_DLG_FLD_INPUT_ED_EDIT,1419528707,
 sw_MultiLineEdit_DLG_JAVAEDIT_ED_EDIT,1419610637,
@@ -9698,9 +9690,6 @@ sw_NumericField_TP_TOX_ENTRY_NF_LEVEL_OL,879155353,
 sw_NumericField_TP_TOX_SELECT_NF_LEVEL,879138825,
 sw_PushButton_DLG_AP_INSERT_DB_SEL_PB_TBL_AUTOFMT,1435046432,
 sw_PushButton_DLG_AP_INSERT_DB_SEL_PB_TBL_FORMAT,1435046431,
-sw_PushButton_DLG_AUTOFMT_TABLE_BTN_ADD,1425330793,
-sw_PushButton_DLG_AUTOFMT_TABLE_BTN_REMOVE,1425330794,
-sw_PushButton_DLG_AUTOFMT_TABLE_BTN_RENAME,1425330795,
 sw_PushButton_DLG_BIB_BASE_PB_DELETE,1428722180,
 sw_PushButton_DLG_BIB_BASE_PB_NEW,1428722179,
 sw_PushButton_DLG_BIB_BASE_PB_RENAME,1428722187,
diff --git a/helpcontent2/source/text/swriter/01/05150101.xhp b/helpcontent2/source/text/swriter/01/05150101.xhp
index 0d59518..97c0e54 100644
--- a/helpcontent2/source/text/swriter/01/05150101.xhp
+++ b/helpcontent2/source/text/swriter/01/05150101.xhp
@@ -39,13 +39,13 @@
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="hid/.uno:AutoFormat" id="bm_id3150343" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_AUTOFMT_TABLE" id="bm_id3150249" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/autoformattable/AutoFormatTableDialog" id="bm_id3150249" localize="false"/>
 <bookmark xml-lang="en-US" branch="index" id="bm_id2655415"><bookmark_value>tables;AutoFormat function</bookmark_value>
       <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>
+      <paragraph xml-lang="en-US" id="par_id3149500" role="paragraph" l10n="U" oldref="2"><variable id="autoformattabelle"><ahelp hid="modules/swriter/ui/autoformattable/AutoFormatTableDialog">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"/>
@@ -62,13 +62,13 @@
             <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"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/autoformattable/formatlb" 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="par_id3149022" role="paragraph" l10n="U" oldref="9"><ahelp hid="modules/swriter/ui/autoformattable/formatlb">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/modules/swriter/ui/autoformattable/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>
+      <paragraph xml-lang="en-US" id="par_id3151185" role="paragraph" l10n="U" oldref="11"><ahelp hid="modules/swriter/ui/autoformattable/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>
@@ -83,40 +83,36 @@
             <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"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/autoformattable/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="par_id3150707" role="paragraph" l10n="U" oldref="17"><ahelp hid="modules/swriter/ui/autoformattable/remove">Deletes the selected table style.</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"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/autoformattable/numformatcb" 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="par_id3150970" role="paragraph" l10n="U" oldref="34"><ahelp hid="modules/swriter/ui/autoformattable/numformatcb">Includes numbering formats in the selected table style.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/autoformattable/fontcb" 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="par_id3152961" role="paragraph" l10n="U" oldref="25"><ahelp hid="modules/swriter/ui/autoformattable/fontcb">Includes font formatting in the selected table style.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/autoformattable/alignmentcb" 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="par_id3155896" role="paragraph" l10n="U" oldref="21"><ahelp hid="modules/swriter/ui/autoformattable/alignmentcb">Includes alignment settings in the selected table style.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/autoformattable/bordercb" 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="par_id3154200" role="paragraph" l10n="U" oldref="23"><ahelp hid="modules/swriter/ui/autoformattable/bordercb">Includes border styles in the selected table style.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/autoformattable/patterncb" 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="par_id3151325" role="paragraph" l10n="U" oldref="27"><ahelp hid="modules/swriter/ui/autoformattable/patterncb">Includes background styles in the selected table style.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/autoformattable/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>
+      <paragraph xml-lang="en-US" id="par_id3149490" role="paragraph" l10n="U" oldref="29"><ahelp hid="modules/swriter/ui/autoformattable/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
+</helpdocument>
commit beb00e7bfb058161ed80eee06ed13f88df73f3f9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Sep 21 09:45:17 2012 +0100

    update Char Name tabpage help ids for .ui conversion
    
    Change-Id: I5261bd9a55b56e29b3a7505321f989d9017409cb

diff --git a/helpcontent2/helpers/help_hid.lst b/helpcontent2/helpers/help_hid.lst
index fa827cd..84bbc09 100644
--- a/helpcontent2/helpers/help_hid.lst
+++ b/helpcontent2/helpers/help_hid.lst
@@ -3953,7 +3953,6 @@ HID_STYLIST_DELETE,33178,
 HID_STYLIST_EDIT,33177,
 HID_STYLIST_NEW,33176,
 HID_SVXDLG_FILTER_WARNING,34195,
-HID_SVXPAGE_CHAR_NAME,34160,
 HID_SVXPAGE_GRFCROP,34143,
 HID_SVXPAGE_JSEARCH_OPTIONS,34188,
 HID_SVXPAGE_NUM_OPTIONS,34057,
@@ -8066,14 +8065,6 @@ svx_ComboBox_RID_SVXDLG_IMAPURL_CBB_TARGETS,1244991489,
 svx_ComboBox_RID_SVXDLG_IMAP_CBB_URL,2318700545,
 svx_ComboBox_RID_SVXDLG_SEARCH_ED_REPLACE,2311655440,
 svx_ComboBox_RID_SVXDLG_SEARCH_ED_SEARCH,2311655435,
-svx_ComboBox_RID_SVXPAGE_CHAR_NAME_LB_CTL_NAME,704630906,
-svx_ComboBox_RID_SVXPAGE_CHAR_NAME_LB_CTL_STYLE,704630908,
-svx_ComboBox_RID_SVXPAGE_CHAR_NAME_LB_EAST_NAME,704630896,
-svx_ComboBox_RID_SVXPAGE_CHAR_NAME_LB_EAST_STYLE,704630898,
-svx_ComboBox_RID_SVXPAGE_CHAR_NAME_LB_WEST_NAME,704630886,
-svx_ComboBox_RID_SVXPAGE_CHAR_NAME_LB_WEST_NAME_NOCJK,704631208,
-svx_ComboBox_RID_SVXPAGE_CHAR_NAME_LB_WEST_STYLE,704630888,
-svx_ComboBox_RID_SVXPAGE_CHAR_NAME_LB_WEST_STYLE_NOCJK,704631210,
 svx_ComboBox_RID_SVXPAGE_HYPERLINK_DOCUMENT_CB_FRAME,704483360,
 svx_ComboBox_RID_SVXPAGE_HYPERLINK_INTERNET_CB_FRAME,704450592,
 svx_ComboBox_RID_SVXPAGE_HYPERLINK_MAIL_CB_FRAME,704466976,
@@ -8383,11 +8374,6 @@ svx_ListBox_RID_SVXPAGE_BORDER_LB_SHADOWCOLOR,700796452,
 svx_ListBox_RID_SVXPAGE_CAPTION_LB_ANSATZ,703172098,
 svx_ListBox_RID_SVXPAGE_CAPTION_LB_ANSATZ_REL,703172099,
 svx_ListBox_RID_SVXPAGE_CAPTION_LB_WINKEL,703172097,
-svx_ListBox_RID_SVXPAGE_CHAR_NAME_LB_COLOR2,704630414,
-svx_ListBox_RID_SVXPAGE_CHAR_NAME_LB_CTL_LANG,704630400,
-svx_ListBox_RID_SVXPAGE_CHAR_NAME_LB_EAST_LANG,704630390,
-svx_ListBox_RID_SVXPAGE_CHAR_NAME_LB_WEST_LANG,704630380,
-svx_ListBox_RID_SVXPAGE_CHAR_NAME_LB_WEST_LANG_NOCJK,704630702,
 svx_ListBox_RID_SVXPAGE_COLORCONFIG_LB_COLORSCHEME,704794115,
 svx_ListBox_RID_SVXPAGE_COLOR_LB_COLOR,701697537,
 svx_ListBox_RID_SVXPAGE_COLOR_LB_COLORMODEL,701697538,
@@ -8466,10 +8452,6 @@ svx_MenuButton_RID_SVXPAGE_MENUS_BTN_CHANGE_ENTRY,705507646,
 svx_MenuButton_RID_SVXPAGE_NUM_OPTIONS_MB_BITMAP,704311480,
 svx_Menu_RID_SVXPAGE_LINE_MB_SYMBOL_BITMAP,537296896,
 svx_Menu_RID_SVXPAGE_NUM_OPTIONS_MB_BITMAP,539885568,
-svx_MetricBox_RID_SVXPAGE_CHAR_NAME_LB_CTL_SIZE,704636542,
-svx_MetricBox_RID_SVXPAGE_CHAR_NAME_LB_EAST_SIZE,704636532,
-svx_MetricBox_RID_SVXPAGE_CHAR_NAME_LB_WEST_SIZE,704636522,
-svx_MetricBox_RID_SVXPAGE_CHAR_NAME_LB_WEST_SIZE_NOCJK,704636844,
 svx_MetricBox_RID_SVXPAGE_TABULATOR_ED_TABPOS,700753418,
 svx_MetricField_OFA_TP_VIEW_MF_SELECTION,810523208,
 svx_MetricField_OFA_TP_VIEW_MF_WINDOWSIZE,810523158,
diff --git a/helpcontent2/source/text/shared/01/05020100.xhp b/helpcontent2/source/text/shared/01/05020100.xhp
index 26ae242..b32afbf 100644
--- a/helpcontent2/source/text/shared/01/05020100.xhp
+++ b/helpcontent2/source/text/shared/01/05020100.xhp
@@ -52,11 +52,11 @@
 <bookmark_value>languages; spellchecking and formatting</bookmark_value>
 <bookmark_value>characters; enabling CTL and Asian characters</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/CUI_HID_SVXPAGE_CHAR_NAME" id="bm_id3148919" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/charnamepage/CharNamePage" id="bm_id3148919" localize="false"/>
 <paragraph role="heading" id="hd_id3154812" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><switchinline select="appl"><caseinline select="CHART"><link href="text/shared/01/05020100.xhp" name="Characters">Characters</link>
 </caseinline><defaultinline><link href="text/shared/01/05020100.xhp" name="Font">Font</link></defaultinline></switchinline></paragraph>
 </section>
-<paragraph role="paragraph" id="par_id3158405" xml-lang="en-US" l10n="U" oldref="2"><variable id="zn"><ahelp hid="HID_SVXPAGE_CHAR_NAME">Specify the formatting and the font that you want to apply.</ahelp>
+<paragraph role="paragraph" id="par_id3158405" xml-lang="en-US" l10n="U" oldref="2"><variable id="zn"><ahelp hid="cui/ui/charnamepage/CharNamePage">Specify the formatting and the font that you want to apply.</ahelp>
 </variable></paragraph>
 <section id="howtoget">
   <embed href="text/shared/00/00040500.xhp#schrift"/>
@@ -77,39 +77,39 @@
 </listitem>
 </list>
 <paragraph role="note" id="par_id3153663" xml-lang="en-US" l10n="U" oldref="58">To enable support for complex text layout and Asian character sets, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>, and then select the <emph>Enabled </emph>box in the corresponding area.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_NAME" id="bm_id3149796" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_NAME" id="bm_id3159158" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_NAME_NOCJK" id="bm_id3149795" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_NAME" id="bm_id3155419" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/charnamepage/westfontnamelb-cjk" id="bm_id3149796" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/charnamepage/eastfontnamelb" id="bm_id3159158" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/charnamepage/westfontnamelb-nocjk" id="bm_id3149795" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/charnamepage/ctlfontnamelb" id="bm_id3155419" localize="false"/>
 <paragraph role="heading" id="hd_id3148686" xml-lang="en-US" level="2" l10n="U" oldref="4">Font</paragraph>
-<paragraph role="paragraph" id="par_id3148491" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SVX_COMBOBOX_RID_SVXPAGE_CHAR_NAME_LB_CTL_NAME">Enter the name of an installed font that you want to use, or select a font from the list.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3148491" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="cui/ui/charnamepage/ctlfontnamelb">Enter the name of an installed font that you want to use, or select a font from the list.</ahelp></paragraph>
 <embed href="text/shared/02/02020000.xhp#vorschautext"/>
 <embed href="text/shared/00/00000007.xhp#objektleiste"/>
 <embed href="text/shared/02/02020000.xhp#syschriftart"/>
-<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_STYLE" id="bm_id3158432" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_STYLE" id="bm_id3150670" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_STYLE_NOCJK" id="bm_id3158430" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_STYLE" id="bm_id3144439" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/charnamepage/weststylelb-cjk" id="bm_id3158432" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/charnamepage/eaststylelb" id="bm_id3150670" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/charnamepage/weststylelb-nocjk" id="bm_id3158430" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/charnamepage/ctlstylelb" id="bm_id3144439" localize="false"/>
 <paragraph role="heading" id="hd_id3143271" xml-lang="en-US" level="2" l10n="U" oldref="10">Typeface</paragraph>
-<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SVX_COMBOBOX_RID_SVXPAGE_CHAR_NAME_LB_CTL_STYLE">Select the formatting that you want to apply.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="cui/ui/charnamepage/ctlstylelb">Select the formatting that you want to apply.</ahelp></paragraph>
 <embed href="text/shared/00/00000007.xhp#objektleiste"/>
 <embed href="text/shared/00/00040502.xhp#syfett"/>
 <embed href="text/shared/00/00040502.xhp#sykursiv"/>
-<bookmark xml-lang="en-US" branch="hid/cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_SIZE" id="bm_id3154389" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_SIZE" id="bm_id3148756" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_SIZE_NOCJK" id="bm_id3154388" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_SIZE" id="bm_id3152771" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/charnamepage/westsizelb-cjk" id="bm_id3154389" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/charnamepage/eastsizelb" id="bm_id3148756" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/charnamepage/westsizelb-nocjk" id="bm_id3154388" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/charnamepage/ctlsizelb" id="bm_id3152771" localize="false"/>
 <paragraph role="heading" id="hd_id3151054" xml-lang="en-US" level="2" l10n="CHG" oldref="16">Size</paragraph>
-<paragraph role="paragraph" id="par_id3150359" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SVX_METRICBOX_RID_SVXPAGE_CHAR_NAME_LB_CTL_SIZE">Enter or select the font size that you want to apply. For scalable fonts, you can also enter decimal values.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3150359" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="cui/ui/charnamepage/ctlsizelb">Enter or select the font size that you want to apply. For scalable fonts, you can also enter decimal values.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3148797" xml-lang="en-US" l10n="U" oldref="45">If you are creating a Style that is based on another Style, you can enter a percentage value or a point value (for example, -2pt or +5pt).</paragraph>
 <embed href="text/shared/00/00000007.xhp#objektleiste"/>
 <embed href="text/shared/02/02030000.xhp#syschriftgroesse"/>
-<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_LANG" id="bm_id3154153" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_LANG" id="bm_id3150289" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_LANG_NOCJK" id="bm_id3149204" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_LANG" id="bm_id3154068" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/charnamepage/westsizelb-cjk" id="bm_id3154153" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/charnamepage/eastsizelb" id="bm_id3150289" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/charnamepage/ctlsizelb-nocjk" id="bm_id3149204" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/charnamepage/ctlsizelb" id="bm_id3154068" localize="false"/>
 <paragraph role="heading" id="hd_id3151176" xml-lang="en-US" level="2" l10n="U" oldref="38">Language</paragraph>
-<paragraph role="paragraph" id="par_id3157961" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_NAME_LB_CTL_LANG">Sets the language that the spellchecker uses for the selected text or the text that you type. Available language modules have a check mark in front of them.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3157961" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="cui/ui/charnamepage/ctlsizelb">Sets the language that the spellchecker uses for the selected text or the text that you type. Available language modules have a check mark in front of them.</ahelp></paragraph>
 <switch select="appl">
 <case select="CALC">
 <paragraph role="note" id="par_id3153770" xml-lang="en-US" l10n="U" oldref="59">You can only change the language setting for cells (choose <emph>Format - Cells – Numbers</emph>).</paragraph>
diff --git a/helpcontent2/source/text/shared/01/05020200.xhp b/helpcontent2/source/text/shared/01/05020200.xhp
index 2b9daf4..726e613 100644
--- a/helpcontent2/source/text/shared/01/05020200.xhp
+++ b/helpcontent2/source/text/shared/01/05020200.xhp
@@ -67,7 +67,6 @@
          <embed href="text/shared/00/00040500.xhp#schrifteffekt"/>
       </section>
       <embed href="text/shared/01/05020100.xhp#hinweis"/>
-<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_COLOR2" id="bm_id3153728" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/fontcolorlb" id="bm_id0123200902114658" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3149482" role="heading" level="2" l10n="U"
                  oldref="81">Font Color</paragraph>
commit 07d3d1305528abd30d676d1ac91751db7ab3ad13
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Sep 19 12:50:48 2012 +0100

    update Char HyperLink tabpage help ids for .ui conversion
    
    Change-Id: Ic94143cb39b4d5930b3d9aa044dab3272fecdf0c

diff --git a/helpcontent2/helpers/help_hid.lst b/helpcontent2/helpers/help_hid.lst
index 31360ea..fa827cd 100644
--- a/helpcontent2/helpers/help_hid.lst
+++ b/helpcontent2/helpers/help_hid.lst
@@ -954,7 +954,6 @@ HID_CAPTION_CTL_TYPE,34002,
 HID_CHARMAP_CTL_SHOWCHAR,33878,
 HID_CHARMAP_CTL_SHOWSET,33876,
 HID_CHARMAP_CTL_SHOWTEXT,33877,
-HID_CHAR_URL,53190,
 HID_CHECK_FOR_UPD_CANCEL,34855,
 HID_CHECK_FOR_UPD_CLOSE,34846,
 HID_CHECK_FOR_UPD_DESCRIPTION,34854,
@@ -9245,7 +9244,6 @@ sw_ComboBox_DLG_INSERT_BOOKMARK_CB_BOOKMARK,1428738049,
 sw_ComboBox_DLG_MM_CUSTOMIZEADDRESSBLOCK_CB_FIELD,1435308087,
 sw_ComboBox_DLG_SAVE_LABEL_CB_MAKE,1446645763,
 sw_ComboBox_MD_EDIT_REGION_LB_SUBREG,1405833254,
-sw_ComboBox_TP_CHAR_URL_LB_TARGET,878366781,
 sw_ComboBox_TP_FRM_URL_CB_FRAME,878350432,
 sw_ComboBox_TP_INSERT_SECTION_ED_RNAME,879054868,
 sw_ComboBox_TP_INSERT_SECTION_LB_SUBREG,879054886,
@@ -9313,9 +9311,6 @@ sw_Edit_TP_BUSINESS_DATA_ED_STATE,879233077,
 sw_Edit_TP_BUSINESS_DATA_ED_STREET,879233060,
 sw_Edit_TP_BUSINESS_DATA_ED_WWW,879233075,
 sw_Edit_TP_BUSINESS_DATA_ED_ZIP,879233062,
-sw_Edit_TP_CHAR_URL_ED_NAME,878364738,
-sw_Edit_TP_CHAR_URL_ED_TEXT,878364736,
-sw_Edit_TP_CHAR_URL_ED_URL,878364724,
 sw_Edit_TP_DROPCAPS_EDT_TEXT,877824009,
 sw_Edit_TP_ENDNOTEOPTION_ED_CONT,881149993,
 sw_Edit_TP_ENDNOTEOPTION_ED_CONT_FROM,881149995,
@@ -9464,8 +9459,6 @@ sw_ListBox_DLG_SORTING_DLB_KEY1,1428770311,
 sw_ListBox_DLG_SORTING_DLB_KEY2,1428770314,
 sw_ListBox_DLG_SORTING_DLB_KEY3,1428770317,
 sw_ListBox_DLG_SORTING_LB_LANG,1428770340,
-sw_ListBox_TP_CHAR_URL_LB_NOT_VISITED,878366266,
-sw_ListBox_TP_CHAR_URL_LB_VISITED,878366264,
 sw_ListBox_TP_COLUMN_LB_POSITION,877874726,
 sw_ListBox_TP_COLUMN_LB_STYLE,877874722,
 sw_ListBox_TP_COLUMN_LB_TEXTDIRECTION,877874749,
@@ -9799,8 +9792,6 @@ sw_PushButton_MD_EDIT_REGION_CB_DISMISS,1405833730,
 sw_PushButton_MD_EDIT_REGION_PB_FILE,1405833768,
 sw_PushButton_MD_EDIT_REGION_PB_OPTIONS,1405833771,
 sw_PushButton_MD_EDIT_REGION_PB_PASSWD,1405833779,
-sw_PushButton_TP_CHAR_URL_PB_EVENT,878367291,
-sw_PushButton_TP_CHAR_URL_PB_URL,878367292,
 sw_PushButton_TP_CONDCOLL_PB_ASSIGN,878449162,
 sw_PushButton_TP_CONDCOLL_PB_REMOVE,878449161,
 sw_PushButton_TP_DOC_STAT_PB_PDATE,877908499,
diff --git a/helpcontent2/source/text/shared/01/05020400.xhp b/helpcontent2/source/text/shared/01/05020400.xhp
index 4f0eef0..899847e 100644
--- a/helpcontent2/source/text/shared/01/05020400.xhp
+++ b/helpcontent2/source/text/shared/01/05020400.xhp
@@ -46,8 +46,7 @@
 <bookmark_value>text;hyperlinks</bookmark_value>
 <bookmark_value>links; character formats</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_CHAR_URL" id="bm_id3153089" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertHyperlinkDlg" id="bm_id3389476" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/charurlpage/CharURLPage" id="bm_id3153089" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:InsertHyperlinkDlg" id="bm_id3155934" localize="false"/>
 <paragraph role="heading" id="hd_id3152895" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05020400.xhp" name="Hyperlink">Hyperlink</link></paragraph>
 <paragraph role="paragraph" id="par_id3149388" xml-lang="en-US" l10n="U" oldref="2"><variable id="hyperlinktext"><ahelp hid=".uno:InsertHyperlinkDlg">Assigns a new hyperlink or edits the selected hyperlink.</ahelp>
@@ -62,39 +61,39 @@
 </section>
 <paragraph role="heading" id="hd_id3147243" xml-lang="en-US" level="2" l10n="U" oldref="12">Hyperlink</paragraph>
 <paragraph role="paragraph" id="par_id3156113" xml-lang="en-US" l10n="U" oldref="13">Specify the properties for the hyperlink.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_CHAR_URL:ED_URL" id="bm_id3148685" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/charurlpage/urled" id="bm_id3148685" localize="false"/>
 <paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="3" l10n="U" oldref="14">URL</paragraph>
-<paragraph role="paragraph" id="par_id3153332" xml-lang="en-US" l10n="U" oldref="15"><variable id="texturl"><ahelp hid="SW:EDIT:TP_CHAR_URL:ED_URL">Enter a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link> for the file that you want to open when you click the hyperlink.</ahelp> If you do not specify a target frame, the file opens in the current document or frame.
+<paragraph role="paragraph" id="par_id3153332" xml-lang="en-US" l10n="U" oldref="15"><variable id="texturl"><ahelp hid="modules/swriter/ui/charurlpage/urled">Enter a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link> for the file that you want to open when you click the hyperlink.</ahelp> If you do not specify a target frame, the file opens in the current document or frame.
 </variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_CHAR_URL:PB_URL" id="bm_id3150771" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/charurlpage/urlpb" id="bm_id3150771" localize="false"/>
 <paragraph role="heading" id="hd_id3153716" xml-lang="en-US" level="3" l10n="U" oldref="16">Browse</paragraph>
-<paragraph role="paragraph" id="par_id3157910" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SW:PUSHBUTTON:TP_CHAR_URL:PB_URL">Locate the file that you want to link to, and then click <emph>Open</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_CHAR_URL:ED_TEXT" id="bm_id3159166" localize="false"/>
+<paragraph role="paragraph" id="par_id3157910" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="modules/swriter/ui/charurlpage/urlpb">Locate the file that you want to link to, and then click <emph>Open</emph>.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/charurlpage/texted" id="bm_id3159166" localize="false"/>
 <paragraph role="heading" id="hd_id3156152" xml-lang="en-US" level="3" l10n="U" oldref="18">Reference</paragraph>
-<paragraph role="paragraph" id="par_id3155450" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SW:EDIT:TP_CHAR_URL:ED_TEXT">Enter the text that you want to display for the hyperlink.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_CHAR_URL:PB_EVENT" id="bm_id3148491" localize="false"/>
+<paragraph role="paragraph" id="par_id3155450" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="modules/swriter/ui/charurlpage/texted">Enter the text that you want to display for the hyperlink.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/charurlpage/eventpb" id="bm_id3148491" localize="false"/>
 <paragraph role="heading" id="hd_id3158430" xml-lang="en-US" level="3" l10n="U" oldref="28">Events</paragraph>
-<paragraph role="paragraph" id="par_id3153257" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SW:PUSHBUTTON:TP_CHAR_URL:PB_EVENT">Specify an event that triggers when you click the hyperlink.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_CHAR_URL:ED_NAME" id="bm_id3146847" localize="false"/>
+<paragraph role="paragraph" id="par_id3153257" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="modules/swriter/ui/charurlpage/eventpb">Specify an event that triggers when you click the hyperlink.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/charurlpage/nameed" id="bm_id3146847" localize="false"/>
 <paragraph role="heading" id="hd_id3153348" xml-lang="en-US" level="3" l10n="U" oldref="30">Name</paragraph>
 <section id="textname">
-<paragraph role="paragraph" id="par_id3156023" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SW:EDIT:TP_CHAR_URL:ED_NAME">Enter a name for the hyperlink.</ahelp> $[officename] inserts a NAME tag in the hyperlink:</paragraph>
+<paragraph role="paragraph" id="par_id3156023" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="modules/swriter/ui/charurlpage/nameed">Enter a name for the hyperlink.</ahelp> $[officename] inserts a NAME tag in the hyperlink:</paragraph>
 <paragraph role="paragraph" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="34"><A HREF="http://www.example.com/" NAME="Nametext" TARGET="_blank">Note</A></paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:TP_CHAR_URL:LB_TARGET" id="bm_id3146795" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/charurlpage/targetfrmlb" id="bm_id3146795" localize="false"/>
 <paragraph role="heading" id="hd_id3155923" xml-lang="en-US" level="3" l10n="U" oldref="20">Frame</paragraph>
 <section id="textframe2">
-<paragraph role="paragraph" id="par_id3147559" xml-lang="en-US" l10n="U" oldref="21"><variable id="textframe"><ahelp hid="SW:COMBOBOX:TP_CHAR_URL:LB_TARGET">Enter the name of the frame that you want the linked file to open in, or select a predefined frame from the list.</ahelp> If you leave this box blank, the linked file opens in the current browser window.
+<paragraph role="paragraph" id="par_id3147559" xml-lang="en-US" l10n="U" oldref="21"><variable id="textframe"><ahelp hid="modules/swriter/ui/charurlpage/targetfrmlb">Enter the name of the frame that you want the linked file to open in, or select a predefined frame from the list.</ahelp> If you leave this box blank, the linked file opens in the current browser window.
 </variable></paragraph>
 </section>
 <paragraph role="heading" id="hd_id3149656" xml-lang="en-US" level="2" l10n="U" oldref="22">Character Styles</paragraph>
 <paragraph role="paragraph" id="par_id3148664" xml-lang="en-US" l10n="U" oldref="23">Specify the formatting options for the hyperlink.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_CHAR_URL:LB_VISITED" id="bm_id3148740" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/charurlpage/visitedlb" id="bm_id3148740" localize="false"/>
 <paragraph role="heading" id="hd_id3151056" xml-lang="en-US" level="3" l10n="U" oldref="24">Visited links</paragraph>
-<paragraph role="paragraph" id="par_id3150359" xml-lang="en-US" l10n="CHG" oldref="25"><ahelp hid="SW:LISTBOX:TP_CHAR_URL:LB_VISITED">Select a formatting style to use for visited links from the list. To add or modify a style in this list, close this dialog, and click the <emph>Styles and Formatting</emph> icon on the <emph>Formatting</emph> toolbar.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_CHAR_URL:LB_NOT_VISITED" id="bm_id3148676" localize="false"/>
+<paragraph role="paragraph" id="par_id3150359" xml-lang="en-US" l10n="CHG" oldref="25"><ahelp hid="modules/swriter/ui/charurlpage/visitedlb">Select a formatting style to use for visited links from the list. To add or modify a style in this list, close this dialog, and click the <emph>Styles and Formatting</emph> icon on the <emph>Formatting</emph> toolbar.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/charurlpage/unvisitedlb" id="bm_id3148676" localize="false"/>
 <paragraph role="heading" id="hd_id3154365" xml-lang="en-US" level="3" l10n="U" oldref="26">Unvisited links</paragraph>
-<paragraph role="paragraph" id="par_id3154216" xml-lang="en-US" l10n="CHG" oldref="27"><ahelp hid="SW:LISTBOX:TP_CHAR_URL:LB_NOT_VISITED">Select a formatting style to use for unvisited links from the list. To add or modify a style in this list, close this dialog, and click the <emph>Styles and Formatting</emph> icon on the <emph>Formatting</emph> toolbar.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154216" xml-lang="en-US" l10n="CHG" oldref="27"><ahelp hid="modules/swriter/ui/charurlpage/unvisitedlb">Select a formatting style to use for unvisited links from the list. To add or modify a style in this list, close this dialog, and click the <emph>Styles and Formatting</emph> icon on the <emph>Formatting</emph> toolbar.</ahelp></paragraph>
 <section id="relatedtopics">
 <paragraph role="paragraph" id="par_id3143231" xml-lang="en-US" l10n="C"><link href="text/shared/02/09070000.xhp" name="Hyperlink dialog">Hyperlink dialog</link></paragraph>
 <paragraph role="paragraph" id="par_id3152933" xml-lang="en-US" l10n="C"><link href="text/swriter/01/05060700.xhp" name="Assign macro">Assign macro</link></paragraph>
commit 4488c5377b9df5d5ef6011d8305a62704412bab4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Sep 19 12:05:49 2012 +0100

    update Effects tabpage help ids for .ui conversion
    
    Change-Id: I7f58a97c45432d1be321d1343500063889cc37a7

diff --git a/helpcontent2/helpers/help_hid.lst b/helpcontent2/helpers/help_hid.lst
index 5c4ccc3..31360ea 100644
--- a/helpcontent2/helpers/help_hid.lst
+++ b/helpcontent2/helpers/help_hid.lst
@@ -3954,7 +3954,6 @@ HID_STYLIST_DELETE,33178,
 HID_STYLIST_EDIT,33177,
 HID_STYLIST_NEW,33176,
 HID_SVXDLG_FILTER_WARNING,34195,
-HID_SVXPAGE_CHAR_EFFECTS,34161,
 HID_SVXPAGE_CHAR_NAME,34160,
 HID_SVXPAGE_GRFCROP,34143,
 HID_SVXPAGE_JSEARCH_OPTIONS,34188,
@@ -7979,7 +7978,6 @@ svx_CheckBox_RID_SVXPAGE_BORDER_CB_MERGEADJACENTBORDERS,700793922,
 svx_CheckBox_RID_SVXPAGE_BORDER_CB_MERGEWITHNEXT,700793921,
 svx_CheckBox_RID_SVXPAGE_BORDER_CB_SYNC,700793915,
 svx_CheckBox_RID_SVXPAGE_CAPTION_CB_LAENGE,703169537,
-svx_CheckBox_RID_SVXPAGE_CHAR_EFFECTS_CB_INDIVIDUALWORDS,704644327,
 svx_CheckBox_RID_SVXPAGE_ERR_REP_SEND_CB_ERRSEND_CONTACT,700892186,
 svx_CheckBox_RID_SVXPAGE_FOOTER_CB_DYNSPACING,701137942,
 svx_CheckBox_RID_SVXPAGE_FOOTER_CB_HEIGHT_DYN,701137935,
@@ -8386,16 +8384,6 @@ svx_ListBox_RID_SVXPAGE_BORDER_LB_SHADOWCOLOR,700796452,
 svx_ListBox_RID_SVXPAGE_CAPTION_LB_ANSATZ,703172098,
 svx_ListBox_RID_SVXPAGE_CAPTION_LB_ANSATZ_REL,703172099,
 svx_ListBox_RID_SVXPAGE_CAPTION_LB_WINKEL,703172097,
-svx_ListBox_RID_SVXPAGE_CHAR_EFFECTS_LB_EFFECTS2,704646861,
-svx_ListBox_RID_SVXPAGE_CHAR_EFFECTS_LB_EMPHASIS,704646898,
-svx_ListBox_RID_SVXPAGE_CHAR_EFFECTS_LB_FONTCOLOR,704646858,
-svx_ListBox_RID_SVXPAGE_CHAR_EFFECTS_LB_OVERLINE,704646878,
-svx_ListBox_RID_SVXPAGE_CHAR_EFFECTS_LB_OVERLINE_COLOR,704646880,
-svx_ListBox_RID_SVXPAGE_CHAR_EFFECTS_LB_POSITION,704646900,
-svx_ListBox_RID_SVXPAGE_CHAR_EFFECTS_LB_RELIEF,704646863,
-svx_ListBox_RID_SVXPAGE_CHAR_EFFECTS_LB_STRIKEOUT,704646882,
-svx_ListBox_RID_SVXPAGE_CHAR_EFFECTS_LB_UNDERLINE,704646884,
-svx_ListBox_RID_SVXPAGE_CHAR_EFFECTS_LB_UNDERLINE_COLOR,704646886,
 svx_ListBox_RID_SVXPAGE_CHAR_NAME_LB_COLOR2,704630414,
 svx_ListBox_RID_SVXPAGE_CHAR_NAME_LB_CTL_LANG,704630400,
 svx_ListBox_RID_SVXPAGE_CHAR_NAME_LB_EAST_LANG,704630390,
@@ -9044,10 +9032,6 @@ svx_TriStateBox_RID_SVXPAGE_AREA_TSB_SCALE,701629953,
 svx_TriStateBox_RID_SVXPAGE_AREA_TSB_STEPCOUNT,701629955,
 svx_TriStateBox_RID_SVXPAGE_AREA_TSB_STRETCH,701629957,
 svx_TriStateBox_RID_SVXPAGE_AREA_TSB_TILE,701629956,
-svx_TriStateBox_RID_SVXPAGE_CHAR_EFFECTS_CB_BLINKING,704644818,
-svx_TriStateBox_RID_SVXPAGE_CHAR_EFFECTS_CB_CHARHIDDEN,704644819,
-svx_TriStateBox_RID_SVXPAGE_CHAR_EFFECTS_CB_OUTLINE,704644816,
-svx_TriStateBox_RID_SVXPAGE_CHAR_EFFECTS_CB_SHADOW,704644817,
 svx_TriStateBox_RID_SVXPAGE_EXT_PARAGRAPH_BTN_HYPHEN,700827186,
 svx_TriStateBox_RID_SVXPAGE_EXT_PARAGRAPH_BTN_KEEPTOGETHER,700827203,
 svx_TriStateBox_RID_SVXPAGE_EXT_PARAGRAPH_BTN_ORPHANS,700827207,
diff --git a/helpcontent2/source/text/shared/01/05020200.xhp b/helpcontent2/source/text/shared/01/05020200.xhp
index 33b6d28..2b9daf4 100644
--- a/helpcontent2/source/text/shared/01/05020200.xhp
+++ b/helpcontent2/source/text/shared/01/05020200.xhp
@@ -59,19 +59,19 @@
          <bookmark_value>ignored font colors</bookmark_value>
          <bookmark_value>colors;ignored text color</bookmark_value>
 </bookmark><comment>ufi inserted "fonts;colors"</comment><comment>MW copied two entries about font colors to text/shared/guide/text_color</comment><comment>mw added 3 index entries about ignored font colors</comment>
-<bookmark xml-lang="en-US" branch="hid/CUI_HID_SVXPAGE_CHAR_EFFECTS" id="bm_id3147090" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/EffectsPage" id="bm_id3147090" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3153514" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/05020200.xhp" name="Font Effects">Font Effects</link></paragraph>
-         <paragraph xml-lang="en-US" id="par_id3149205" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_SVXPAGE_CHAR_EFFECTS">Specify the font effects that you want to use.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149205" role="paragraph" l10n="U" oldref="2"><ahelp hid="cui/ui/effectspage/EffectsPage">Specify the font effects that you want to use.</ahelp></paragraph>
       </section>
       <section id="howtoget">
          <embed href="text/shared/00/00040500.xhp#schrifteffekt"/>
       </section>
       <embed href="text/shared/01/05020100.xhp#hinweis"/>
 <bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_COLOR2" id="bm_id3153728" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_FONTCOLOR" id="bm_id0123200902114658" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/fontcolorlb" id="bm_id0123200902114658" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3149482" role="heading" level="2" l10n="U"
                  oldref="81">Font Color</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3146924" role="paragraph" l10n="U" oldref="82"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_FONTCOLOR">Sets the color for the selected text. If you select<emph> Automatic</emph>, the text color is set to black for light backgrounds and to white for dark backgrounds.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3146924" role="paragraph" l10n="U" oldref="82"><ahelp hid="cui/ui/effectspage/fontcolorlb">Sets the color for the selected text. If you select<emph> Automatic</emph>, the text color is set to black for light backgrounds and to white for dark backgrounds.</ahelp></paragraph>
       <list type="unordered">
          <listitem>
             <paragraph xml-lang="en-US" id="par_idN10CC2" role="paragraph" l10n="CHG">To change the color of a text selection, select the text that you want to change, and click the <emph>Font Color</emph> icon. To apply a different color, click the arrow next to the <emph>Font Color</emph> icon, and then select the color that you want to use.</paragraph>
@@ -99,11 +99,11 @@
 <bookmark xml-lang="en-US" branch="hid/.uno:FontColor" id="bm_id3145801" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id3144766" role="paragraph" l10n="CHG" oldref="84"><ahelp hid=".uno:FontColor" visibility="hidden"><variable id="textfarbe">Click to apply the current font color to the selected characters. You can also click here, and then drag a selection to change the text color. Click the arrow next to the icon to open the Font color toolbar.
 </variable></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_EFFECTS2" id="bm_id0123200902144733" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/effectslb" id="bm_id0123200902144733" localize="false"/>
 <switch select="appl">
 <case select="WRITER">
 <paragraph xml-lang="en-US" id="hd_id3146137" role="heading" level="2" l10n="U" oldref="3">Effects</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3150084" role="paragraph" l10n="U" oldref="64"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_EFFECTS2">Select the font effects that you want to apply.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150084" role="paragraph" l10n="U" oldref="64"><ahelp hid="cui/ui/effectspage/effectslb">Select the font effects that you want to apply.</ahelp></paragraph>
       <paragraph xml-lang="en-US" id="hd_id3149575" role="heading" level="3" l10n="U"
                  oldref="65">Effects</paragraph>
       <paragraph xml-lang="en-US" id="par_id3148944" role="paragraph" l10n="U" oldref="66">The following capitalization effects are available:</paragraph>
@@ -126,70 +126,70 @@
       </list>
 </case>
 </switch>
-<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_RELIEF" id="bm_id0123200902202314" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/relieflb" id="bm_id0123200902202314" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3154129" role="heading" level="2" l10n="U"
                  oldref="76">Relief</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3146974" role="paragraph" l10n="U" oldref="77"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_RELIEF">Select a relief effect to apply to the selected text. The embossed relief makes the characters appear as if they are raised above the page. The engraved relief makes the characters appear as if they are pressed into the page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_OUTLINE" id="bm_id0123200902155356" localize="false"/>
+      <paragraph xml-lang="en-US" id="par_id3146974" role="paragraph" l10n="U" oldref="77"><ahelp hid="cui/ui/effectspage/relieflb">Select a relief effect to apply to the selected text. The embossed relief makes the characters appear as if they are raised above the page. The engraved relief makes the characters appear as if they are pressed into the page.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/outlinecb" id="bm_id0123200902155356" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3147287" role="heading" level="3" l10n="CHG"
                  oldref="72">Outline</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3159126" role="paragraph" l10n="U" oldref="73"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_OUTLINE">Displays the outline of the selected characters. This effect does not work with every font.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_SHADOW" id="bm_id0123200902163281" localize="false"/>
+      <paragraph xml-lang="en-US" id="par_id3159126" role="paragraph" l10n="U" oldref="73"><ahelp hid="cui/ui/effectspage/outlinecb">Displays the outline of the selected characters. This effect does not work with every font.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/shadowcb" id="bm_id0123200902163281" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3163714" role="heading" level="3" l10n="CHG"
                  oldref="74">Shadow</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3150962" role="paragraph" l10n="U" oldref="75"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_SHADOW">Adds a shadow that casts below and to the right of the selected characters.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150962" role="paragraph" l10n="U" oldref="75"><ahelp hid="cui/ui/effectspage/shadowcb">Adds a shadow that casts below and to the right of the selected characters.</ahelp></paragraph>
 <switch select="appl">
 <case select="WRITER">
 <bookmark xml-lang="en-US" branch="index" id="bm_id410168"><bookmark_value>blinking fonts</bookmark_value>
       <bookmark_value>flashing fonts</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_BLINKING" id="bm_id012320090217277" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/blinkingcb" id="bm_id012320090217277" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3152941" role="heading" level="3" l10n="U"
                  oldref="15">Blinking</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3145662" role="paragraph" l10n="U" oldref="16"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_BLINKING">Makes the selected characters blink. You cannot change the blink frequency.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_CHARHIDDEN" id="bm_id0123200902180465" localize="false"/>
+      <paragraph xml-lang="en-US" id="par_id3145662" role="paragraph" l10n="U" oldref="16"><ahelp hid="cui/ui/effectspage/blinkingcb">Makes the selected characters blink. You cannot change the blink frequency.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/hiddencb" id="bm_id0123200902180465" localize="false"/>
 <paragraph xml-lang="en-US" id="par_idN10B81" role="heading" level="3" l10n="NEW">Hidden</paragraph>
-      <paragraph xml-lang="en-US" id="par_idN10B85" role="paragraph" l10n="NEW"><ahelp hid="svx:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_CHARHIDDEN">Hides the selected characters.</ahelp> To display the hidden text, ensure that <emph>Non-printing Characters</emph> is selected in the <emph>View</emph> menu. You can also choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph>
+      <paragraph xml-lang="en-US" id="par_idN10B85" role="paragraph" l10n="NEW"><ahelp hid="cui/ui/effectspage/hiddencb">Hides the selected characters.</ahelp> To display the hidden text, ensure that <emph>Non-printing Characters</emph> is selected in the <emph>View</emph> menu. You can also choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph>
 </caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Writer - Formatting Aids</emph> and select <emph>Hidden text</emph>.</paragraph>
 </case>
 </switch>
 <bookmark xml-lang="en-US" branch="hid/.uno:Overline" id="bm_id0123200902261777" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id0123200902291084" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden"><emph>Overlines or removes overlining from the selected text. If the cursor is not in a word, the new text that you enter is overlined.</emph></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_OVERLINE" id="bm_id0123200902014986" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/overlinelb" id="bm_id0123200902014986" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id0123200902243376" role="heading" level="2" l10n="NEW">Overlining</paragraph>
-      <paragraph xml-lang="en-US" id="par_id0123200902243343" role="paragraph" l10n="NEW"><ahelp hid=".">Select the overlining style that you want to apply. To apply the overlining to words only, select the <emph>Individual Words</emph> box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_OVERLINE_COLOR" id="bm_id0123200902032228" localize="false"/>
+      <paragraph xml-lang="en-US" id="par_id0123200902243343" role="paragraph" l10n="NEW"><ahelp hid="cui/ui/effectspage/overlinelb">Select the overlining style that you want to apply. To apply the overlining to words only, select the <emph>Individual Words</emph> box.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/overlinecolorlb" id="bm_id0123200902032228" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id0123200902243470" role="heading" level="2" l10n="NEW">Overline color</paragraph>
-      <paragraph xml-lang="en-US" id="par_id0123200902243466" role="paragraph" l10n="NEW"><ahelp hid=".">Select the color for the overlining.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_STRIKEOUT" id="bm_id0123200902074215" localize="false"/>
+      <paragraph xml-lang="en-US" id="par_id0123200902243466" role="paragraph" l10n="NEW"><ahelp hid="cui/ui/effectspage/overlinecolorlb">Select the color for the overlining.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/strikeoutlb" id="bm_id0123200902074215" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3150400" role="heading" level="2" l10n="U"
                  oldref="43">Strikethrough</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3145203" role="paragraph" l10n="U" oldref="44"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_STRIKEOUT">Select a strikethrough style for the selected text.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145203" role="paragraph" l10n="U" oldref="44"><ahelp hid="cui/ui/effectspage/strikeoutlb">Select a strikethrough style for the selected text.</ahelp></paragraph>
       <paragraph xml-lang="en-US" id="par_id3150496" role="note" l10n="U" oldref="48">If you save your document in MS Word format, all of the strikethrough styles are converted to the single line style.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_UNDERLINE" id="bm_id0123200902053711" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/underlinelb" id="bm_id0123200902053711" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3151226" role="heading" level="2" l10n="U"
                  oldref="41">Underlining</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3147576" role="paragraph" l10n="U" oldref="42"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_UNDERLINE">Select the underlining style that you want to apply. To apply the underlining to words only, select the <emph>Individual Words</emph> box.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147576" role="paragraph" l10n="U" oldref="42"><ahelp hid="cui/ui/effectspage/underlinelb">Select the underlining style that you want to apply. To apply the underlining to words only, select the <emph>Individual Words</emph> box.</ahelp></paragraph>
       <paragraph xml-lang="en-US" id="par_id3153147" role="note" l10n="U" oldref="58">If you apply underlining to a superscript text, the underlining is raised to the level of the superscript. If the superscript is contained in a word with normal text, the underlining is not raised.</paragraph>
       <embed href="text/shared/00/00000007.xhp#objektleiste"/>
       <embed href="text/shared/00/00040502.xhp#syunterstreichen"/>
-<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_UNDERLINE_COLOR" id="bm_id0123200902050229" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/underlinecolorlb" id="bm_id0123200902050229" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3148642" role="heading" level="2" l10n="CHG"
                  oldref="78">Underline color</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3150254" role="paragraph" l10n="U" oldref="79"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_UNDERLINE_COLOR">Select the color for the underlining.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_CHAR_EFFECTS:CB_INDIVIDUALWORDS" id="bm_id0123200902090860" localize="false"/>
+      <paragraph xml-lang="en-US" id="par_id3150254" role="paragraph" l10n="U" oldref="79"><ahelp hid="cui/ui/effectspage/underlinecolorlb">Select the color for the underlining.</ahelp></paragraph>

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list