From 0d8b37cd9e0b89d1136b09a81671c88fc91fee3e Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 29 Aug 2013 11:52:10 +0100 Subject: 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) --- helpers/help_hid.lst | 10 ------- source/text/shared/01/05020300.xhp | 58 +++++++++++++++++++------------------- source/text/shared/01/05340300.xhp | 46 +++++++++++++++--------------- 3 files changed, 52 insertions(+), 62 deletions(-) diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index a73fe6213b..100bf461c5 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -7554,9 +7554,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, @@ -7651,7 +7648,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_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_OTHER,1237964817, 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_MACROASSIGN,705560576, 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 c8ab7a0045..9363b5547f 100644 --- a/source/text/shared/01/05020300.xhp +++ b/source/text/shared/01/05020300.xhp @@ -39,7 +39,7 @@ mw transferred "format codes;" to Calc guide Format_value_userdef.xhp and "numers;" and "cells;" to Calc guide Format_table.xhp. Changed "currencies;" - + @@ -49,9 +49,9 @@
- + Category - Select a category from the list, and then select a formatting style in the Format box. + Select a category from the list, and then select a formatting style in the Format box. @@ -62,67 +62,67 @@ - + Format - Select how you want the contents of the selected cell(s) to be displayed. The code for the selected option is displayed in the Format Code box. + Select how you want the contents of the selected cell(s) to be displayed. The code for the selected option is displayed in the Format Code box. - + Currency category list boxes - Select a currency, and then scroll to the top of the Format list to view the formatting options for the currency. + Select a currency, and then scroll to the top of the Format list to view the formatting options for the currency.
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 Language box.
- + Language - Specifies the language setting for the selected cells + Specifies the language setting for the selected cells fields. With the language set to Automatic, $[officename] automatically applies the number formats associated with the system default language. Select any language to fix the settings for the selected cells fields. 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. - + Source format - Uses the same number format as the cells containing the data for the chart. + Uses the same number format as the cells containing the data for the chart. Options Specify the options for the selected format. - + Decimal places - Enter the number of decimal places that you want to display. + Enter the number of decimal places that you want to display. - + Leading zeroes - Enter the maximum number of zeroes to display in front of the decimal point. + Enter the maximum number of zeroes to display in front of the decimal point. - + Negative numbers in red - Changes the font color of negative numbers to red. + Changes the font color of negative numbers to red. - + Use thousands separator - Inserts a separator between thousands. The type of separator that is used depends on your language settings. + Inserts a separator between thousands. The type of separator that is used depends on your language settings. - + Format code - Displays the number format code for the selected format. You can also enter a custom format. The following options are only available for user-defined number formats. + Displays the number format code for the selected format. You can also enter a custom format. The following options are only available for user-defined number formats. - + Add - Adds the number format code that you entered to the user-defined category. + Adds the number format code that you entered to the user-defined category. - + Delete - Deletes the selected number format. The changes are effective after you restart $[officename]. + Deletes the selected number format. The changes are effective after you restart $[officename]. - + Edit Comment - Adds a comment to the selected number format. + Adds a comment to the selected number format. - + Name line - Enter a comment for the selected number format, and then click outside this box. + Enter a comment for the selected number format, and then click outside this box.
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 @@ aligning; cells cells; aligning - + Alignment -Sets the alignment options for the contents of the current cell, or the selected cells. +Sets the alignment options for the contents of the current cell, or the selected cells.
- + Horizontal -Select the horizontal alignment option that you want to apply to the cell contents. +Select the horizontal alignment option that you want to apply to the cell contents. Default Aligns numbers to the right, and text to the left. If the Default option is selected, numbers will be aligned to the right and text will be left-justified.UFI: removed two help idsUFI: 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. @@ -68,14 +68,14 @@ 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. Distributed Aligns contents evenly across the whole cell. Unlike Justified, it justifies the very last line of text, too. - + Indent -Indents from the left edge of the cell by the amount that you enter. - +Indents from the left edge of the cell by the amount that you enter. + Vertical -Select the vertical alignment option that you want to apply to the cell contents. +Select the vertical alignment option that you want to apply to the cell contents. Default -Aligns the cell contents to the bottom of the cell.UFI: removed two help ids +Aligns the cell contents to the bottom of the cell.UFI: removed two help ids Top Aligns the contents of the cell to the upper edge of the cell. @@ -106,14 +106,14 @@ - -Click in the dial to set the text orientation. - + +Click in the dial to set the text orientation. + 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. - +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. + Reference edge -Specify the cell edge from which to write the rotated text. +Specify the cell edge from which to write the rotated text. @@ -128,24 +128,24 @@ Text Extension Inside Cells: Writes the rotated text only within the cell. - + Vertically stacked Aligns text vertically.UFI: see spec "Shrink to fit" - + Asian layout mode -This checkbox is only available if Asian language support is enabled and the text direction is set to 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. +This checkbox is only available if Asian language support is enabled and the text direction is set to 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. Properties Determine the text flow in a cell. - + Wrap text automatically -Wraps text onto another line at the cell border. The number of lines depends on the width of the cell. To enter a manual line break, press Command +Wraps text onto another line at the cell border. The number of lines depends on the width of the cell. To enter a manual line break, press Command Ctrl+Enter in the cell.conditional switches inside AVIS do not work - + Hyphenation active -Enables word hyphenation for text wrapping to the next line. - +Enables word hyphenation for text wrapping to the next line. + Shrink to fit cell size 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. -- cgit