Skip to content

Commit 152197d

Browse files
committed
Use 'zeros' instead of 'zeroes', at least in UI
1 parent d6af8f9 commit 152197d

File tree

14 files changed

+19
-21
lines changed

14 files changed

+19
-21
lines changed

main/basic/source/sbx/sbxscan.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ void ImpCvtNum( double nNum, short nPrec, ::rtl::OUString& rRes, sal_Bool bCoreS
402402
double dMaxNumWithoutExp = (nPrec == 6) ? 1E6 : 1E14;
403403
myftoa( nNum, p, nPrec,( nNum &&( nNum < 1E-1 || nNum >= dMaxNumWithoutExp ) ) ? 4:0,
404404
sal_False, sal_True, cDecimalSep );
405-
// Trailing Zeroes weg:
405+
// Trailing Zeros weg:
406406
for( p = cBuf; *p &&( *p != 'E' ); p++ ) {}
407407
q = p; p--;
408408
while( nPrec && *p == '0' ) nPrec--, p--;

main/cui/source/tabpages/numfmt.src

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
142142
{
143143
Pos = MAP_APPFONT ( 12, 120 ) ;
144144
Size = MAP_APPFONT ( 69, 8 ) ;
145-
Text [ en-US ] = "Leading ~zeroes" ;
145+
Text [ en-US ] = "Leading ~zeros" ;
146146
};
147147
NumericField ED_LEADZEROES
148148
{

main/filter/source/graphicfilter/ipict/ipict.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ sal_uLong PictReader::ReadAndDrawRgn(PictDrawingMethod eMethod)
612612
// and on each line: a0 < b0 < a1 < b1 < ... < a_{n_i} < b_{n_i}
613613

614614
// it can be probably decoded as :
615-
// M=an empty mask: ie. (0, 0, ... ) with (left_box-right_box+1) zeroes
615+
// M=an empty mask: i.e. (0, 0, ... ) with (left_box-right_box+1) zeros
616616
// then for each line (y_i):
617617
// - takes M and inverts all values in [a_0,b_0-1], in [a_1,b_1-1] ...
618618
// - sets M = new y_i line mask

main/helpcontent2/source/text/sbasic/shared/03120301.xhp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<paragraph role="paragraph" id="par_id3151210" xml-lang="en-US" l10n="U">If <emph>Number</emph> has fewer digits than the number of zeros in the format code, (on either side of the decimal), leading or trailing zeros are displayed. If the number has more digits to the left of the decimal separator than the amount of zeros in the format code, the additional digits are displayed without formatting.</paragraph>
5050
<paragraph role="paragraph" id="par_id3151176" xml-lang="en-US" l10n="U">Decimal places in the number are rounded according to the number of zeros that appear after the decimal separator in the <emph>Format</emph> code.</paragraph>
5151
<paragraph role="paragraph" id="par_id3154123" xml-lang="en-US" l10n="U"><emph>#:</emph> If <emph>Number</emph> contains a digit at the position of the # placeholder in the <emph>Format</emph> code, the digit is displayed, otherwise nothing is displayed at this position.</paragraph>
52-
<paragraph role="paragraph" id="par_id3148452" xml-lang="en-US" l10n="U">This symbol works like the 0, except that leading or trailing zeroes are not displayed if there are more # characters in the format code than digits in the number. Only the relevant digits of the number are displayed.</paragraph>
52+
<paragraph role="paragraph" id="par_id3148452" xml-lang="en-US" l10n="U">This symbol works like the 0, except that leading or trailing zeros are not displayed if there are more # characters in the format code than digits in the number. Only the relevant digits of the number are displayed.</paragraph>
5353
<paragraph role="paragraph" id="par_id3159150" xml-lang="en-US" l10n="U"><emph>.:</emph> The decimal placeholder determines the number of decimal places to the left and right of the decimal separator.</paragraph>
5454
<paragraph role="paragraph" id="par_id3159252" xml-lang="en-US" l10n="U">If the format code contains only # placeholders to the left of this symbol, numbers less than 1 begin with a decimal separator. To always display a leading zero with fractional numbers, use 0 as a placeholder for the first digit to the left of the decimal separator.</paragraph>
5555
<paragraph role="paragraph" id="par_id3153368" xml-lang="en-US" l10n="U"><emph>%:</emph> Multiplies the number by 100 and inserts the percent sign (%) where the number appears in the format code.</paragraph>

main/helpcontent2/source/text/shared/01/02070000.xhp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
</caseinline></switchinline></paragraph>
166166
<switch select="appl">
167167
<case select="CALC">
168-
<paragraph role="note" id="par_id3155084" xml-lang="en-US" l10n="U">If you select a mathematical operation and clear the <emph>Skip empty cells</emph> box, empty cells in the clipboard are treated as zeroes. For example, if you apply the <emph>Multiply</emph> operation, the target cells are filled with zeroes.</paragraph>
168+
<paragraph role="note" id="par_id3155084" xml-lang="en-US" l10n="U">If you select a mathematical operation and clear the <emph>Skip empty cells</emph> box, empty cells in the clipboard are treated as zeros. For example, if you apply the <emph>Multiply</emph> operation, the target cells are filled with zeros.</paragraph>
169169
</case>
170170
</switch>
171171
<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_INSCONT:BTN_TRANSPOSE" id="bm_id3145649" localize="false"/>

main/helpcontent2/source/text/shared/01/05020300.xhp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@
7676
<paragraph xml-lang="en-US" id="hd_id3153970" role="heading" level="3" l10n="U">Decimal places</paragraph>
7777
<paragraph xml-lang="en-US" id="par_id3154684" role="paragraph" l10n="U"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS">Enter the number of decimal places that you want to display.</ahelp></paragraph>
7878
<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES" id="bm_id3153106" localize="false"/>
79-
<paragraph xml-lang="en-US" id="hd_id3154819" role="heading" level="3" l10n="U">Leading zeroes</paragraph>
80-
<paragraph xml-lang="en-US" id="par_id3147352" role="paragraph" l10n="CHG"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES">Enter the maximum number of zeroes to display in front of the decimal point.</ahelp></paragraph>
79+
<paragraph xml-lang="en-US" id="hd_id3154819" role="heading" level="3" l10n="U">Leading zeros</paragraph>
80+
<paragraph xml-lang="en-US" id="par_id3147352" role="paragraph" l10n="CHG"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES">Enter the maximum number of zeros to display in front of the decimal point.</ahelp></paragraph>
8181
<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED" id="bm_id3157895" localize="false"/>
8282
<paragraph xml-lang="en-US" id="hd_id3155131" role="heading" level="3" l10n="U">Negative numbers in red</paragraph>
8383
<paragraph xml-lang="en-US" id="par_id3159252" role="paragraph" l10n="U"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED">Changes the font color of negative numbers to red.</ahelp></paragraph>

main/helpcontent2/source/text/shared/01/05020301.xhp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
</listitem>
5858
</list>
5959
<paragraph role="heading" id="hd_id3151262" xml-lang="en-US" level="2" l10n="U">Decimal Places and Significant Digits</paragraph>
60-
<paragraph role="paragraph" id="par_id3153624" xml-lang="en-US" l10n="U">Use zero (0) or the number sign (#) as placeholders in your number format code to represent numbers. The (#) only displays significant digits, while the (0) displays zeroes if there are fewer digits in the number than in the number format.</paragraph>
60+
<paragraph role="paragraph" id="par_id3153624" xml-lang="en-US" l10n="U">Use zero (0) or the number sign (#) as placeholders in your number format code to represent numbers. The (#) only displays significant digits, while the (0) displays zeros if there are fewer digits in the number than in the number format.</paragraph>
6161
<paragraph role="paragraph" id="par_id3153323" xml-lang="en-US" l10n="U">Use question marks (?) to represent the number of digits to include in the numerator and the denominator of a fraction. Fractions that do not fit the pattern that you define are displayed as floating point numbers.</paragraph>
6262
<paragraph role="paragraph" id="par_id3148440" xml-lang="en-US" l10n="U">If a number contains more digits to the right of the decimal delimiter than there are placeholders in the format, the number is rounded accordingly. If a number contains more digits to the left of the decimal delimiter than there are placeholders in the format, the entire number is displayed. Use the following list as a guide for using placeholders when you create a number format code:</paragraph>
6363
<table id="tbl_id3149760">

main/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ void NumberFormatPropertyPanel::Initialize()
138138
mpEdDecimals->SetModifyHdl( aLink );
139139
mpEdLeadZeroes->SetModifyHdl( aLink );
140140
mpEdDecimals->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Decimal Places"))); //wj acc
141-
mpEdLeadZeroes->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Leading Zeroes"))); //wj acc
141+
mpEdLeadZeroes->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Leading Zeros"))); //wj acc
142142
mpBtnNegRed->SetClickHdl( aLink );
143143
mpBtnThousand->SetClickHdl( aLink );
144144

main/sc/source/ui/sidebar/NumberFormatPropertyPanel.src

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
*
2020
*************************************************************/
2121

22-
23-
2422
#include "NumberFormatPropertyPanel.hrc"
2523
#include <sfx2/sidebar/ResourceDefinitions.hrc>
2624
#include "sc.hrc"
@@ -131,15 +129,15 @@ Control RID_PROPERTYPANEL_SC_NUMBERFORMAT
131129
{
132130
Pos = MAP_APPFONT ( FT_LEADZEROES_X, FT_LEADZEROES_Y ) ;
133131
Size = MAP_APPFONT (PROPERTYPAGE_WIDTH - MBOX_WIDTH * 2 - SECTIONPAGE_MARGIN_HORIZONTAL * 2, TEXT_HEIGHT ) ;
134-
Text [ en-US ] = "Leading ~zeroes:" ;
132+
Text [ en-US ] = "Leading ~zeros:" ;
135133
};
136134
NumericField ED_LEADZEROES
137135
{
138136
Border = TRUE ;
139137
Pos = MAP_APPFONT ( LB_LEADZEROES_X, LB_LEADZEROES_Y ) ;
140138
Size = MAP_APPFONT ( MBOX_WIDTH, MBOX_HEIGHT ) ;
141139
HelpID = HID_PROPERTY_PANEL_NUMFMT_ED_LEADZEROES ;
142-
QuickHelpText [ en-US ] = "Enter the maximum number of zeroes to display before the decimal point." ;
140+
QuickHelpText [ en-US ] = "Enter the maximum number of zeros to display before the decimal point." ;
143141
Spin = TRUE ;
144142
Maximum = 20 ;
145143
Last = 15 ;

main/svx/source/svdraw/svdmodel.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1064,14 +1064,14 @@ void SdrModel::ImpSetUIUnit()
10641064
nDiv *= aUIScale.GetNumerator();
10651065
}
10661066

1067-
// shorten trailing zeroes for dividend
1067+
// shorten trailing zeros for dividend
10681068
while(0 == (nMul % 10))
10691069
{
10701070
nUIUnitComma--;
10711071
nMul /= 10;
10721072
}
10731073

1074-
// shorten trailing zeroes for divisor
1074+
// shorten trailing zeros for divisor
10751075
while(0 == (nDiv % 10))
10761076
{
10771077
nUIUnitComma++;

0 commit comments

Comments
 (0)