Hi,
I would like you to review the following patch:
https://gerrit.libreoffice.org/5676
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/help refs/changes/76/5676/1
text alignment help text got detacted from the tabpage
(cherry picked from commit 2ce8cb8c7b0ee203f2df743849e959949ccc2fc1)
Change-Id: Idf28d8a969f01761e82b32c12ee2b9ab745719ed
numberformatpage->numberingformatpage
Change-Id: Idb74e753b64e3d575d5a951a0cdca6aae69f543d
(cherry picked from commit fad218bb130d6134c05206e0018ed50834829fd4)
---
M helpers/help_hid.lst
M source/text/shared/01/05020300.xhp
M source/text/shared/01/05340300.xhp
3 files changed, 52 insertions(+), 62 deletions(-)
diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index a73fe62..100bf46 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -7554,9 +7554,6 @@
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,
@@ -7651,7 +7648,6 @@
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_ANGLE_MTR_FLD_ANGLE,701504019,
svx_MetricField_RID_SVXPAGE_ANGLE_MTR_FLD_POS_X,701504007,
svx_MetricField_RID_SVXPAGE_ANGLE_MTR_FLD_POS_Y,701504008,
@@ -7807,7 +7803,6 @@
svx_NumericField_RID_SVXDLG_SEARCHSIMILARITY_NF_SHORTER,1237964819,
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_AREA_NUM_FLD_STEPCOUNT,701634561,
svx_NumericField_RID_SVXPAGE_GRID_NUM_FLD_DIVISION_X,703207437,
svx_NumericField_RID_SVXPAGE_GRID_NUM_FLD_DIVISION_Y,703207438,
@@ -8052,11 +8047,6 @@
svx_TabPage_RID_SVXPAGE_TEXTANIMATION,703725568,
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_AREA_TSB_ORIGINAL,701629958,
svx_TriStateBox_RID_SVXPAGE_AREA_TSB_SCALE,701629953,
svx_TriStateBox_RID_SVXPAGE_AREA_TSB_STEPCOUNT,701629955,
diff --git a/source/text/shared/01/05020300.xhp
b/source/text/shared/01/05020300.xhp
index c8ab7a0..9363b55 100644
--- a/source/text/shared/01/05020300.xhp
+++ b/source/text/shared/01/05020300.xhp
@@ -39,7 +39,7 @@
</bookmark>
<comment>mw transferred "format codes;" to Calc guide
Format_value_userdef.xhp and "numers;" and "cells;" to Calc guide
Format_table.xhp. Changed "currencies;"</comment>
-<bookmark xml-lang="en-US"
branch="hid/cui/ui/numberformatpage/NumberFormatPage" id="bm_id3150147"
localize="false"/>
+<bookmark xml-lang="en-US"
branch="hid/cui/ui/numberingformatpage/NumberingFormatPage" id="bm_id3150147"
localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:TableNumberFormatDialog"
id="bm_id2370759" localize="false"/>
@@ -49,9 +49,9 @@
<section id="howtoget">
<embed href="text/shared/00/00040503.xhp#zahlen"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/numberformatpage/categorylb"
id="bm_id3153312" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/numberingformatpage/categorylb"
id="bm_id3153312" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3155392" role="heading" level="2"
l10n="U" oldref="3">Category</paragraph>
- <paragraph xml-lang="en-US" id="par_id3150774" role="paragraph" l10n="U"
oldref="4"><ahelp hid="cui/ui/numberformatpage/categorylb">Select a category
from the list, and then select a formatting style in the <emph>Format
</emph>box.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150774" role="paragraph" l10n="U"
oldref="4"><ahelp hid="cui/ui/numberingformatpage/categorylb">Select a category
from the list, and then select a formatting style in the <emph>Format
</emph>box.</ahelp></paragraph>
<switch select="appl">
@@ -62,67 +62,67 @@
</switch>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/numberformatpage/formatlb"
id="bm_id3155449" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/numberingformatpage/formatlb"
id="bm_id3155449" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3155342" role="heading" level="2"
l10n="U" oldref="5">Format</paragraph>
- <paragraph xml-lang="en-US" id="par_id3148491" role="paragraph" l10n="U"
oldref="6"><ahelp hid="cui/ui/numberformatpage/formatlb">Select how you want
the contents of the selected cell(s) to be displayed.</ahelp> The code for the
selected option is displayed in the <emph>Format Code</emph> box.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148491" role="paragraph" l10n="U"
oldref="6"><ahelp hid="cui/ui/numberingformatpage/formatlb">Select how you want
the contents of the selected cell(s) to be displayed.</ahelp> The code for the
selected option is displayed in the <emph>Format Code</emph> box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/numberformatpage/currencylb"
id="bm_id3154381" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/numberingformatpage/currencylb"
id="bm_id3154381" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3154811" role="heading" level="3"
l10n="U" oldref="97">Currency category list boxes</paragraph>
- <paragraph xml-lang="en-US" id="par_id3148563" role="paragraph" l10n="U"
oldref="98"><ahelp hid="cui/ui/numberformatpage/currencylb">Select a currency,
and then scroll to the top of the <emph>Format</emph> list to view the
formatting options for the currency.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148563" role="paragraph" l10n="U"
oldref="98"><ahelp hid="cui/ui/numberingformatpage/currencylb">Select a
currency, and then scroll to the top of the <emph>Format</emph> list to view
the formatting options for the currency.</ahelp></paragraph>
<section id="waehrungtext">
<paragraph xml-lang="en-US" id="par_id3150866" role="note" l10n="U"
oldref="99">The format code for currencies uses the form [$xxx-nnn], where xxx
is the currency symbol, and nnn the country code. Special banking symbols, such
as EUR (for Euro), do not require the country code. The currency format is not
dependent on the language that you select in the<emph> Language</emph> box.
</paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/numberformatpage/languagelb"
id="bm_id3148797" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/numberingformatpage/languagelb"
id="bm_id3148797" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3154071" role="heading" level="2"
l10n="U" oldref="23">Language</paragraph>
- <paragraph xml-lang="en-US" id="par_id3154138" role="paragraph" l10n="U"
oldref="24"><ahelp hid="cui/ui/numberformatpage/languagelb">Specifies the
language setting for the selected <switchinline select="appl"><caseinline
select="CALC">cells
+ <paragraph xml-lang="en-US" id="par_id3154138" role="paragraph" l10n="U"
oldref="24"><ahelp hid="cui/ui/numberingformatpage/languagelb">Specifies the
language setting for the selected <switchinline select="appl"><caseinline
select="CALC">cells
</caseinline><defaultinline>fields</defaultinline></switchinline>. With the
language set to <emph>Automatic</emph>, $[officename] automatically applies the
number formats associated with the system default language. Select any language
to fix the settings for the selected <switchinline select="appl"><caseinline
select="CALC">cells
</caseinline><defaultinline>fields</defaultinline></switchinline>.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id3157320" role="paragraph" l10n="U"
oldref="102">The language setting ensures that date and currency formats are
preserved even when the document is opened in an operating system that uses a
different default language setting.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/numberformatpage/sourceformat"
id="bm_id3145747" localize="false"/>
+<bookmark xml-lang="en-US"
branch="hid/cui/ui/numberingformatpage/sourceformat" id="bm_id3145747"
localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3155995" role="heading" level="2"
l10n="U" oldref="104">Source format</paragraph>
- <paragraph xml-lang="en-US" id="par_id3144432" role="paragraph" l10n="U"
oldref="105"><ahelp hid="cui/ui/numberformatpage/sourceformat">Uses the same
number format as the cells containing the data for the
chart.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3144432" role="paragraph" l10n="U"
oldref="105"><ahelp hid="cui/ui/numberingformatpage/sourceformat">Uses the same
number format as the cells containing the data for the
chart.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id3148451" role="heading" level="2"
l10n="U" oldref="7">Options</paragraph>
<paragraph xml-lang="en-US" id="par_id3148922" role="paragraph" l10n="U"
oldref="8">Specify the options for the selected format.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/numberformatpage/decimalsed"
id="bm_id3151178" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/numberingformatpage/decimalsed"
id="bm_id3151178" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3153970" role="heading" level="3"
l10n="U" oldref="9">Decimal places</paragraph>
- <paragraph xml-lang="en-US" id="par_id3154684" role="paragraph" l10n="U"
oldref="10"><ahelp hid="cui/ui/numberformatpage/decimalsed">Enter the number of
decimal places that you want to display.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154684" role="paragraph" l10n="U"
oldref="10"><ahelp hid="cui/ui/numberingformatpage/decimalsed">Enter the number
of decimal places that you want to display.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/numberformatpage/leadzerosed"
id="bm_id3153106" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/numberingformatpage/leadzerosed"
id="bm_id3153106" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3154819" role="heading" level="3"
l10n="U" oldref="11">Leading zeroes</paragraph>
- <paragraph xml-lang="en-US" id="par_id3147352" role="paragraph" l10n="CHG"
oldref="12"><ahelp hid="cui/ui/numberformatpage/leadzerosed">Enter the maximum
number of zeroes to display in front of the decimal point.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147352" role="paragraph" l10n="CHG"
oldref="12"><ahelp hid="cui/ui/numberingformatpage/leadzerosed">Enter the
maximum number of zeroes to display in front of the decimal
point.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/numberformatpage/negnumred"
id="bm_id3157895" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/numberingformatpage/negnumred"
id="bm_id3157895" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3155131" role="heading" level="3"
l10n="U" oldref="13">Negative numbers in red</paragraph>
- <paragraph xml-lang="en-US" id="par_id3159252" role="paragraph" l10n="U"
oldref="14"><ahelp hid="cui/ui/numberformatpage/negnumred">Changes the font
color of negative numbers to red.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159252" role="paragraph" l10n="U"
oldref="14"><ahelp hid="cui/ui/numberingformatpage/negnumred">Changes the font
color of negative numbers to red.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/numberformatpage/thousands"
id="bm_id3148645" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/numberingformatpage/thousands"
id="bm_id3148645" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3147434" role="heading" level="3"
l10n="U" oldref="15">Use thousands separator</paragraph>
- <paragraph xml-lang="en-US" id="par_id3146148" role="paragraph" l10n="U"
oldref="16"><ahelp hid="cui/ui/numberformatpage/thousands">Inserts a separator
between thousands. The type of separator that is used depends on your language
settings.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146148" role="paragraph" l10n="U"
oldref="16"><ahelp hid="cui/ui/numberingformatpage/thousands">Inserts a
separator between thousands. The type of separator that is used depends on your
language settings.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/numberformatpage/formated"
id="bm_id3150961" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/numberingformatpage/formated"
id="bm_id3150961" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3150103" role="heading" level="2"
l10n="U" oldref="17">Format code</paragraph>
- <paragraph xml-lang="en-US" id="par_id3159156" role="paragraph" l10n="U"
oldref="18"><ahelp hid="cui/ui/numberformatpage/formated">Displays the number
format code for the selected format. You can also enter a custom
format.</ahelp> The following options are only available for user-defined
number formats.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159156" role="paragraph" l10n="U"
oldref="18"><ahelp hid="cui/ui/numberingformatpage/formated">Displays the
number format code for the selected format. You can also enter a custom
format.</ahelp> The following options are only available for user-defined
number formats.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/numberformatpage/add"
id="bm_id3163717" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/numberingformatpage/add"
id="bm_id3163717" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3155311" role="heading" level="3"
l10n="U" oldref="19">Add</paragraph>
- <paragraph xml-lang="en-US" id="par_id3147219" role="paragraph" l10n="U"
oldref="20"><ahelp hid="cui/ui/numberformatpage/add">Adds the number format
code that you entered to the user-defined category.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147219" role="paragraph" l10n="U"
oldref="20"><ahelp hid="cui/ui/numberingformatpage/add">Adds the number format
code that you entered to the user-defined category.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/numberformatpage/delete"
id="bm_id3159181" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/numberingformatpage/delete"
id="bm_id3159181" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3149263" role="heading" level="3"
l10n="U" oldref="21">Delete</paragraph>
- <paragraph xml-lang="en-US" id="par_id3154150" role="paragraph" l10n="U"
oldref="22"><ahelp hid="cui/ui/numberformatpage/delete">Deletes the selected
number format.</ahelp> The changes are effective after you restart
$[officename].</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154150" role="paragraph" l10n="U"
oldref="22"><ahelp hid="cui/ui/numberingformatpage/delete">Deletes the selected
number format.</ahelp> The changes are effective after you restart
$[officename].</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/numberformatpage/edit"
id="bm_id3151119" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/numberingformatpage/edit"
id="bm_id3151119" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3153573" role="heading" level="3"
l10n="U" oldref="26">Edit Comment</paragraph>
- <paragraph xml-lang="en-US" id="par_id3083444" role="paragraph" l10n="U"
oldref="27"><ahelp hid="cui/ui/numberformatpage/edit">Adds a comment to the
selected number format.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3083444" role="paragraph" l10n="U"
oldref="27"><ahelp hid="cui/ui/numberingformatpage/edit">Adds a comment to the
selected number format.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/numberformatpage/commented"
id="bm_id3154470" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/numberingformatpage/commented"
id="bm_id3154470" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3150332" role="heading" level="3"
l10n="U" oldref="95">Name line</paragraph>
- <paragraph xml-lang="en-US" id="par_id3156060" role="paragraph" l10n="U"
oldref="96"><ahelp hid="cui/ui/numberformatpage/commented">Enter a comment for
the selected number format, and then click outside this box.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156060" role="paragraph" l10n="U"
oldref="96"><ahelp hid="cui/ui/numberingformatpage/commented">Enter a comment
for the selected number format, and then click outside this
box.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#vorschau"/>
<section id="relatedtopics">
diff --git a/source/text/shared/01/05340300.xhp
b/source/text/shared/01/05340300.xhp
index 1f645fc..bd40933 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>
--
To view, visit https://gerrit.libreoffice.org/5676
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb74e753b64e3d575d5a951a0cdca6aae69f543d
Gerrit-PatchSet: 1
Gerrit-Project: help
Gerrit-Branch: master
Gerrit-Owner: Caolán McNamara <[email protected]>
_______________________________________________
LibreOffice mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
