text alignment help text got detacted from the tabpage

Change-Id: Idf28d8a969f01761e82b32c12ee2b9ab745719ed

2 files changed, 23 insertions, 33 deletions

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 720b4d845c..1376f83295 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -6925,9 +6925,6 @@ svx_ListBox_RID_SVXFLOAT_3D_LB_MAT_EMISSION,3388493428,
 svx_ListBox_RID_SVXFLOAT_3D_LB_MAT_FAVORITES,3388493437,
 svx_ListBox_RID_SVXFLOAT_3D_LB_MAT_SPECULAR,3388493431,
 svx_ListBox_RID_SVXFLOAT_3D_LB_SHADEMODE,3388493358,
-svx_ListBox_RID_SVXPAGE_ALIGNMENT_LB_FRAMEDIR,702189100,
-svx_ListBox_RID_SVXPAGE_ALIGNMENT_LB_HORALIGN,702189068,
-svx_ListBox_RID_SVXPAGE_ALIGNMENT_LB_VERALIGN,702189072,
 svx_ListBox_RID_SVXPAGE_ALIGN_PARAGRAPH_LB_LASTLINE,703778354,
 svx_ListBox_RID_SVXPAGE_ALIGN_PARAGRAPH_LB_TEXTDIRECTION,703778396,
 svx_ListBox_RID_SVXPAGE_ALIGN_PARAGRAPH_LB_VERTALIGN,703778340,
@@ -6994,7 +6991,6 @@ svx_MetricField_RID_SVXFLOAT_3D_MTR_FOCAL_LENGTH,3388496438,
 svx_MetricField_RID_SVXFLOAT_3D_MTR_MAT_SPECULAR_INTENSITY,3388496506,
 svx_MetricField_RID_SVXFLOAT_3D_MTR_PERCENT_DIAGONAL,3388496414,
 svx_MetricField_RID_SVXFLOAT_3D_MTR_SLANT,3388496433,
-svx_MetricField_RID_SVXPAGE_ALIGNMENT_ED_INDENT,702192142,
 svx_MetricField_RID_SVXPAGE_BACKGROUND_MF_COL_TRANS,700733988,
 svx_MetricField_RID_SVXPAGE_BACKGROUND_MF_GRAPH_TRANS,700733990,
 svx_MetricField_RID_SVXPAGE_BORDER_ED_SHADOWSIZE,700799522,
@@ -7093,7 +7089,6 @@ svx_NumericField_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_NF_MIN_WORDLEN,809162880,
 svx_NumericField_RID_OFAPAGE_CONNPOOLOPTIONS_NF_TIMEOUT,809211913,
 svx_NumericField_RID_SVXFLOAT_3D_NUM_HORIZONTAL,3388495897,
 svx_NumericField_RID_SVXFLOAT_3D_NUM_VERTICAL,3388495899,
-svx_NumericField_RID_SVXPAGE_ALIGNMENT_NF_DEGREES,702191640,
 svx_NumericField_RID_SVXPAGE_LINE_DEF_NUM_FLD_1,701569025,
 svx_NumericField_RID_SVXPAGE_LINE_DEF_NUM_FLD_2,701569026,
 svx_NumericField_RID_SVX_DLG_INPUTRECORDNO_1,1368823809,
@@ -7293,11 +7288,6 @@ svx_TabPage_RID_SVXPAGE_IMPROVEMENT,705658880,
 svx_TabPage_RID_SVXPAGE_MACROASSIGN,705560576,
 svx_TabPage_RID_SVX_GRFFILTER_DLG_EMBOSS_TAB,706232320,
 svx_TabPage_RID_SVX_XFORMS_TABPAGES,832110592,
-svx_TriStateBox_RID_SVXPAGE_ALIGNMENT_BTN_ASIAN_VERTICAL,702187035,
-svx_TriStateBox_RID_SVXPAGE_ALIGNMENT_BTN_HYPH,702187050,
-svx_TriStateBox_RID_SVXPAGE_ALIGNMENT_BTN_SHRINK,702187053,
-svx_TriStateBox_RID_SVXPAGE_ALIGNMENT_BTN_TXTSTACKED,702187029,
-svx_TriStateBox_RID_SVXPAGE_ALIGNMENT_BTN_WRAP,702187049,
 svx_TriStateBox_RID_SVXPAGE_LINE_TSB_CENTER_END,701548037,
 svx_TriStateBox_RID_SVXPAGE_LINE_TSB_CENTER_START,701548036,
 svx_TriStateBox_RID_SVXPAGE_MEASURE_TSB_AUTOPOSH,703350276,
diff --git a/source/text/shared/01/05340300.xhp b/source/text/shared/01/05340300.xhp
index 1f645fc787..bd40933065 100644
--- a/source/text/shared/01/05340300.xhp
+++ b/source/text/shared/01/05340300.xhp
@@ -31,16 +31,16 @@
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154545"><bookmark_value>aligning; cells</bookmark_value>
 <bookmark_value>cells; aligning</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/CUI_HID_ALIGNMENT" id="bm_id3147477" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/cellalignment/CellsAlignPage" id="bm_id3147477" localize="false"/>
 <paragraph role="heading" id="hd_id3154545" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05340300.xhp" name="Alignment">Alignment</link></paragraph>
-<paragraph role="paragraph" id="par_id3155577" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="HID_ALIGNMENT">Sets the alignment options for the contents of the current cell, or the selected cells.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3155577" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="cui/ui/cellalignment/CellsAlignPage">Sets the alignment options for the contents of the current cell, or the selected cells.</ahelp></paragraph>
 </section>
 <section id="howtoget">
 <embed href="text/shared/00/00040503.xhp#fozelaus"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_HORALIGN" id="bm_id3152821" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/cellalignment/comboboxHorzAlign" id="bm_id3152821" localize="false"/>
 <paragraph role="heading" id="hd_id3153124" xml-lang="en-US" level="2" l10n="U" oldref="54">Horizontal</paragraph>
-<paragraph role="paragraph" id="par_id3144436" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_ALIGNMENT_LB_HORALIGN">Select the horizontal alignment option that you want to apply to the cell contents.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3144436" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="cui/ui/cellalignment/comboboxHorzAlign">Select the horizontal alignment option that you want to apply to the cell contents.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3146109" xml-lang="en-US" level="3" l10n="U" oldref="56">Default</paragraph>
 <paragraph role="paragraph" id="par_id3166445" xml-lang="en-US" l10n="U" oldref="57">Aligns numbers to the right, and text to the left.</paragraph>
 <paragraph role="note" id="par_id3147010" xml-lang="en-US" l10n="U" oldref="10">If the <emph>Default</emph> option is selected, numbers will be aligned to the right and text will be left-justified.</paragraph><comment>UFI: removed two help ids</comment><comment>UFI: reason: Help IDs .uno:AlignLeft, AlignRight, AlignBlock, AlignHorizontalCenter are the same for Objects in Draw/Impress and for text alignment in Calc. Unfortunately both sets of files are located in shared folder... Must create a special file in scalc or add those as hidden texts to a file in scalc.</comment>
@@ -68,14 +68,14 @@
 <paragraph role="paragraph" id="par_idN107A0" xml-lang="en-US" l10n="NEW">Repeats the cell contents (number and text) until the visible area of the cell is filled. This feature does not work on text that contains line breaks.</paragraph>
 <paragraph role="heading" id="par_idN1079D" xml-lang="en-US" level="3" l10n="NEW">Distributed</paragraph>
 <paragraph role="paragraph" id="par_idN107A1" xml-lang="en-US" l10n="NEW">Aligns contents evenly across the whole cell. Unlike <emph>Justified</emph>, it justifies the very last line of text, too.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_ALIGNMENT:ED_INDENT" id="bm_id3156156" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/cellalignment/spinIndentFrom" id="bm_id3156156" localize="false"/>
 <paragraph role="heading" id="hd_id3158432" xml-lang="en-US" level="2" l10n="U" oldref="41">Indent</paragraph>
-<paragraph role="paragraph" id="par_id3153716" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_ALIGNMENT:ED_INDENT">Indents from the left edge of the cell by the amount that you enter.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_VERALIGN" id="bm_id3153332" localize="false"/>
+<paragraph role="paragraph" id="par_id3153716" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="cui/ui/cellalignment/spinIndentFrom">Indents from the left edge of the cell by the amount that you enter.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/cellalignment/comboboxVertAlign" id="bm_id3153332" localize="false"/>
 <paragraph role="heading" id="hd_id3149903" xml-lang="en-US" level="2" l10n="U" oldref="66">Vertical</paragraph>
-<paragraph role="paragraph" id="par_id3148924" xml-lang="en-US" l10n="U" oldref="67"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_ALIGNMENT_LB_VERALIGN">Select the vertical alignment option that you want to apply to the cell contents.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3148924" xml-lang="en-US" l10n="U" oldref="67"><ahelp hid="cui/ui/cellalignment/comboboxVertAlign">Select the vertical alignment option that you want to apply to the cell contents.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3146848" xml-lang="en-US" level="3" l10n="U" oldref="68">Default</paragraph>
-<paragraph role="paragraph" id="par_id3150822" xml-lang="en-US" l10n="U" oldref="69"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_ALIGNMENT_LB_VERALIGN">Aligns the cell contents to the bottom of the cell.</ahelp></paragraph><comment>UFI: removed two help ids</comment>
+<paragraph role="paragraph" id="par_id3150822" xml-lang="en-US" l10n="U" oldref="69"><ahelp hid="cui/ui/cellalignment/comboboxVertAlign">Aligns the cell contents to the bottom of the cell.</ahelp></paragraph><comment>UFI: removed two help ids</comment>
 <paragraph role="heading" id="hd_id3147531" xml-lang="en-US" level="3" l10n="U" oldref="70">Top</paragraph>
 <paragraph role="paragraph" id="par_id3145085" xml-lang="en-US" l10n="U" oldref="71"><variable id="obentext"><ahelp hid=".uno:AlignTop">Aligns the contents of the cell to the upper edge of the cell.</ahelp>
 </variable></paragraph>
@@ -106,14 +106,14 @@
 <case select="CALC"><embed href="text/scalc/guide/text_rotate.xhp#text_rotate"/>
 </case>
 </switch>
-<bookmark xml-lang="en-US" branch="hid/CUI_HID_ALIGNMENT_CTR_DIAL" id="bm_id3151044" localize="false"/>
-<paragraph role="paragraph" id="par_id3147085" xml-lang="en-US" l10n="U" oldref="49"><ahelp hid="HID_ALIGNMENT_CTR_DIAL">Click in the dial to set the text orientation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_ALIGNMENT:NF_DEGREES" id="bm_id3155742" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/cellalignment/dialcontrol" id="bm_id3151044" localize="false"/>
+<paragraph role="paragraph" id="par_id3147085" xml-lang="en-US" l10n="U" oldref="49"><ahelp hid="cui/ui/cellalignment/dialcontrol">Click in the dial to set the text orientation.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/cellalignment/spinDegrees" id="bm_id3155742" localize="false"/>
 <paragraph role="heading" id="hd_id3150449" xml-lang="en-US" level="3" l10n="CHG" oldref="45">Degrees</paragraph>
-<paragraph role="paragraph" id="par_id3153194" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="SVX_NUMERICFIELD_RID_SVXPAGE_ALIGNMENT_NF_DEGREES">Enter the rotation angle for the text in the selected cell(s). A positive number rotates the text to the left and a negative number rotates the text to the right.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/CUI_HID_ALIGNMENT_CTR_BORDER_LOCK" id="bm_id3125865" localize="false"/>
+<paragraph role="paragraph" id="par_id3153194" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="cui/ui/cellalignment/spinDegrees">Enter the rotation angle for the text in the selected cell(s). A positive number rotates the text to the left and a negative number rotates the text to the right.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/cellalignment/references" id="bm_id3125865" localize="false"/>
 <paragraph role="heading" id="hd_id3150497" xml-lang="en-US" level="3" l10n="U" oldref="75">Reference edge</paragraph>
-<paragraph role="paragraph" id="par_id3154069" xml-lang="en-US" l10n="U" oldref="76"><ahelp hid="HID_ALIGNMENT_CTR_BORDER_LOCK">Specify the cell edge from which to write the rotated text.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154069" xml-lang="en-US" l10n="U" oldref="76"><ahelp hid="cui/ui/cellalignment/references">Specify the cell edge from which to write the rotated text.</ahelp></paragraph>
 <list type="ordered">
 <listitem>
 <paragraph role="listitem" id="par_id3147299" xml-lang="en-US" l10n="U" oldref="78">
@@ -128,24 +128,24 @@
 <emph>Text Extension Inside Cells:</emph> Writes the rotated text only within the cell.</paragraph>
 </listitem>
 </list>
-<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_TXTSTACKED" id="bm_id080420080320333" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/cellalignment/checkVertStack" id="bm_id080420080320333" localize="false"/>
 <paragraph role="heading" id="par_idN109F4" xml-lang="en-US" level="3" l10n="NEW">Vertically stacked</paragraph>
 <paragraph role="paragraph" id="par_idN109F8" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Aligns text vertically.</ahelp><comment>UFI: see spec "Shrink to fit"</comment></paragraph>
 <embed href="text/shared/00/00000007.xhp#asiahinweis"/>
-<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_ASIAN_VERTICAL" id="bm_id3147441" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/cellalignment/checkAsianMode" id="bm_id3147441" localize="false"/>
 <paragraph role="heading" id="hd_id3152576" xml-lang="en-US" level="3" l10n="CHG" oldref="84">Asian layout mode</paragraph>
-<paragraph role="paragraph" id="par_id3150010" xml-lang="en-US" l10n="U" oldref="85">This checkbox is only available if Asian language support is enabled and the text direction is set to vertical. <ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_ALIGNMENT_BTN_ASIAN_VERTICAL">Aligns Asian characters one below the other in the selected cell(s). If the cell contains more than one line of text, the lines are converted to text columns that are arranged from right to left. Western characters in the converted text are rotated 90 degrees to the right. Asian characters are not rotated.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3150010" xml-lang="en-US" l10n="U" oldref="85">This checkbox is only available if Asian language support is enabled and the text direction is set to vertical. <ahelp hid="cui/ui/cellalignment/checkAsianMode">Aligns Asian characters one below the other in the selected cell(s). If the cell contains more than one line of text, the lines are converted to text columns that are arranged from right to left. Western characters in the converted text are rotated 90 degrees to the right. Asian characters are not rotated.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3150032" xml-lang="en-US" level="2" l10n="CHG" oldref="43">Properties</paragraph>
 <paragraph role="paragraph" id="par_id3146120" xml-lang="en-US" l10n="U" oldref="44">Determine the text flow in a cell.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_WRAP" id="bm_id3148577" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/cellalignment/checkWrapTextAuto" id="bm_id3148577" localize="false"/>
 <paragraph role="heading" id="hd_id3145590" xml-lang="en-US" level="3" l10n="CHG" oldref="3">Wrap text automatically</paragraph>
-<paragraph role="paragraph" id="par_id3148555" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_ALIGNMENT:BTN_WRAP">Wraps text onto another line at the cell border. The number of lines depends on the width of the cell.</ahelp> To enter a manual line break, press <switchinline select="sys"><caseinline select="MAC">Command
+<paragraph role="paragraph" id="par_id3148555" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid="cui/ui/cellalignment/checkWrapTextAuto">Wraps text onto another line at the cell border. The number of lines depends on the width of the cell.</ahelp> To enter a manual line break, press <switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter in the cell.<comment>conditional switches inside AVIS do not work</comment></paragraph>
 <embed href="text/shared/guide/breaking_lines.xhp#breaking_lines"/>
-<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_HYPH" id="bm_id3155415" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/cellalignment/checkHyphActive" id="bm_id3155415" localize="false"/>
 <paragraph role="heading" id="hd_id3147380" xml-lang="en-US" level="3" l10n="U" oldref="81">Hyphenation active</paragraph>
-<paragraph role="paragraph" id="par_id3148458" xml-lang="en-US" l10n="U" oldref="82"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_ALIGNMENT_BTN_HYPH">Enables word hyphenation for text wrapping to the next line.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_SHRINK" id="bm_id080420080321345" localize="false"/>
+<paragraph role="paragraph" id="par_id3148458" xml-lang="en-US" l10n="U" oldref="82"><ahelp hid="cui/ui/cellalignment/checkHyphActive">Enables word hyphenation for text wrapping to the next line.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/cellalignment/checkShrinkFitCellSize" id="bm_id080420080321345" localize="false"/>
 <paragraph role="heading" id="par_idN10AD3" xml-lang="en-US" level="3" l10n="NEW">Shrink to fit cell size</paragraph>
 <paragraph role="paragraph" id="par_idN10AD7" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Reduces the apparent size of the font so that the contents of the cell fit into the current cell width. You cannot apply this command to a cell that contains line breaks.</ahelp></paragraph>
 </body>