This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 33fb253a3a Use 'zeros' instead of 'zeroes', at least in UI
33fb253a3a is described below
commit 33fb253a3a8bc3abfa0995f0651beb87be73feeb
Author: mseidel <[email protected]>
AuthorDate: Tue Feb 17 12:33:06 2026 +0100
Use 'zeros' instead of 'zeroes', at least in UI
(cherry picked from commit 152197ddedbab28a70dae9e64f6a5eb3f11bc68d)
---
main/basic/source/sbx/sbxscan.cxx | 2 +-
main/cui/source/tabpages/numfmt.src | 2 +-
main/filter/source/graphicfilter/ipict/ipict.cxx | 2 +-
main/helpcontent2/source/text/sbasic/shared/03120301.xhp | 2 +-
main/helpcontent2/source/text/shared/01/02070000.xhp | 2 +-
main/helpcontent2/source/text/shared/01/05020300.xhp | 4 ++--
main/helpcontent2/source/text/shared/01/05020301.xhp | 2 +-
main/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx | 2 +-
main/sc/source/ui/sidebar/NumberFormatPropertyPanel.src | 6 ++----
main/svx/source/svdraw/svdmodel.cxx | 4 ++--
main/toolkit/workben/layout/number-format.xml | 2 +-
main/vcl/source/fontsubset/sft.cxx | 6 +++---
main/vcl/source/glyphs/gcach_rbmp.cxx | 2 +-
main/vcl/win/source/gdi/salprn.cxx | 2 +-
14 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/main/basic/source/sbx/sbxscan.cxx
b/main/basic/source/sbx/sbxscan.cxx
index 97e5ff181c..699382ac5e 100644
--- a/main/basic/source/sbx/sbxscan.cxx
+++ b/main/basic/source/sbx/sbxscan.cxx
@@ -402,7 +402,7 @@ void ImpCvtNum( double nNum, short nPrec, ::rtl::OUString&
rRes, sal_Bool bCoreS
double dMaxNumWithoutExp = (nPrec == 6) ? 1E6 : 1E14;
myftoa( nNum, p, nPrec,( nNum &&( nNum < 1E-1 || nNum >=
dMaxNumWithoutExp ) ) ? 4:0,
sal_False, sal_True, cDecimalSep );
- // Trailing Zeroes weg:
+ // Trailing Zeros weg:
for( p = cBuf; *p &&( *p != 'E' ); p++ ) {}
q = p; p--;
while( nPrec && *p == '0' ) nPrec--, p--;
diff --git a/main/cui/source/tabpages/numfmt.src
b/main/cui/source/tabpages/numfmt.src
index db6c30c3cb..4fa6333383 100644
--- a/main/cui/source/tabpages/numfmt.src
+++ b/main/cui/source/tabpages/numfmt.src
@@ -142,7 +142,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
{
Pos = MAP_APPFONT ( 12, 120 ) ;
Size = MAP_APPFONT ( 69, 8 ) ;
- Text [ en-US ] = "Leading ~zeroes" ;
+ Text [ en-US ] = "Leading ~zeros" ;
};
NumericField ED_LEADZEROES
{
diff --git a/main/filter/source/graphicfilter/ipict/ipict.cxx
b/main/filter/source/graphicfilter/ipict/ipict.cxx
index e6dbcdceca..14ab926da3 100644
--- a/main/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/main/filter/source/graphicfilter/ipict/ipict.cxx
@@ -612,7 +612,7 @@ sal_uLong PictReader::ReadAndDrawRgn(PictDrawingMethod
eMethod)
// and on each line: a0 < b0 < a1 < b1 < ... < a_{n_i} < b_{n_i}
// it can be probably decoded as :
- // M=an empty mask: ie. (0, 0, ... ) with (left_box-right_box+1) zeroes
+ // M=an empty mask: i.e. (0, 0, ... ) with (left_box-right_box+1) zeros
// then for each line (y_i):
// - takes M and inverts all values in [a_0,b_0-1], in [a_1,b_1-1] ...
// - sets M = new y_i line mask
diff --git a/main/helpcontent2/source/text/sbasic/shared/03120301.xhp
b/main/helpcontent2/source/text/sbasic/shared/03120301.xhp
index 1727a78f15..9b19f1f0a3 100644
--- a/main/helpcontent2/source/text/sbasic/shared/03120301.xhp
+++ b/main/helpcontent2/source/text/sbasic/shared/03120301.xhp
@@ -49,7 +49,7 @@
<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>
<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>
<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>
-<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>
+<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>
<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>
<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>
<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>
diff --git a/main/helpcontent2/source/text/shared/01/02070000.xhp
b/main/helpcontent2/source/text/shared/01/02070000.xhp
index 5f4ad6c970..2b6b50ea49 100644
--- a/main/helpcontent2/source/text/shared/01/02070000.xhp
+++ b/main/helpcontent2/source/text/shared/01/02070000.xhp
@@ -165,7 +165,7 @@
</caseinline></switchinline></paragraph>
<switch select="appl">
<case select="CALC">
-<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>
+<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>
</case>
</switch>
<bookmark xml-lang="en-US"
branch="hid/sc:CheckBox:RID_SCDLG_INSCONT:BTN_TRANSPOSE" id="bm_id3145649"
localize="false"/>
diff --git a/main/helpcontent2/source/text/shared/01/05020300.xhp
b/main/helpcontent2/source/text/shared/01/05020300.xhp
index 13eb7f3586..ebe5eaefaa 100644
--- a/main/helpcontent2/source/text/shared/01/05020300.xhp
+++ b/main/helpcontent2/source/text/shared/01/05020300.xhp
@@ -76,8 +76,8 @@
<paragraph xml-lang="en-US" id="hd_id3153970" role="heading" level="3"
l10n="U">Decimal places</paragraph>
<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>
<bookmark xml-lang="en-US"
branch="hid/cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES"
id="bm_id3153106" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3154819" role="heading" level="3"
l10n="U">Leading zeroes</paragraph>
-<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>
+<paragraph xml-lang="en-US" id="hd_id3154819" role="heading" level="3"
l10n="U">Leading zeros</paragraph>
+<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>
<bookmark xml-lang="en-US"
branch="hid/cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED" id="bm_id3157895"
localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3155131" role="heading" level="3"
l10n="U">Negative numbers in red</paragraph>
<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>
diff --git a/main/helpcontent2/source/text/shared/01/05020301.xhp
b/main/helpcontent2/source/text/shared/01/05020301.xhp
index e08d362f7c..a9f7d9a7c2 100644
--- a/main/helpcontent2/source/text/shared/01/05020301.xhp
+++ b/main/helpcontent2/source/text/shared/01/05020301.xhp
@@ -57,7 +57,7 @@
</listitem>
</list>
<paragraph role="heading" id="hd_id3151262" xml-lang="en-US" level="2"
l10n="U">Decimal Places and Significant Digits</paragraph>
-<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>
+<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>
<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>
<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>
<table id="tbl_id3149760">
diff --git a/main/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
b/main/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
index f2e95a5651..e1eae7bf4b 100644
--- a/main/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
+++ b/main/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
@@ -138,7 +138,7 @@ void NumberFormatPropertyPanel::Initialize()
mpEdDecimals->SetModifyHdl( aLink );
mpEdLeadZeroes->SetModifyHdl( aLink );
mpEdDecimals->SetAccessibleName(::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("Decimal Places"))); //wj acc
- mpEdLeadZeroes->SetAccessibleName(::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("Leading Zeroes"))); //wj acc
+ mpEdLeadZeroes->SetAccessibleName(::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("Leading Zeros"))); //wj acc
mpBtnNegRed->SetClickHdl( aLink );
mpBtnThousand->SetClickHdl( aLink );
diff --git a/main/sc/source/ui/sidebar/NumberFormatPropertyPanel.src
b/main/sc/source/ui/sidebar/NumberFormatPropertyPanel.src
index 1456c226ef..5bc50278b7 100644
--- a/main/sc/source/ui/sidebar/NumberFormatPropertyPanel.src
+++ b/main/sc/source/ui/sidebar/NumberFormatPropertyPanel.src
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#include "NumberFormatPropertyPanel.hrc"
#include <sfx2/sidebar/ResourceDefinitions.hrc>
#include "sc.hrc"
@@ -131,7 +129,7 @@ Control RID_PROPERTYPANEL_SC_NUMBERFORMAT
{
Pos = MAP_APPFONT ( FT_LEADZEROES_X, FT_LEADZEROES_Y ) ;
Size = MAP_APPFONT (PROPERTYPAGE_WIDTH - MBOX_WIDTH * 2 -
SECTIONPAGE_MARGIN_HORIZONTAL * 2, TEXT_HEIGHT ) ;
- Text [ en-US ] = "Leading ~zeroes:" ;
+ Text [ en-US ] = "Leading ~zeros:" ;
};
NumericField ED_LEADZEROES
{
@@ -139,7 +137,7 @@ Control RID_PROPERTYPANEL_SC_NUMBERFORMAT
Pos = MAP_APPFONT ( LB_LEADZEROES_X, LB_LEADZEROES_Y ) ;
Size = MAP_APPFONT ( MBOX_WIDTH, MBOX_HEIGHT ) ;
HelpID = HID_PROPERTY_PANEL_NUMFMT_ED_LEADZEROES ;
- QuickHelpText [ en-US ] = "Enter the maximum number of zeroes
to display before the decimal point." ;
+ QuickHelpText [ en-US ] = "Enter the maximum number of zeros to
display before the decimal point." ;
Spin = TRUE ;
Maximum = 20 ;
Last = 15 ;
diff --git a/main/svx/source/svdraw/svdmodel.cxx
b/main/svx/source/svdraw/svdmodel.cxx
index e33ca5fe77..caf4bc62cd 100644
--- a/main/svx/source/svdraw/svdmodel.cxx
+++ b/main/svx/source/svdraw/svdmodel.cxx
@@ -1064,14 +1064,14 @@ void SdrModel::ImpSetUIUnit()
nDiv *= aUIScale.GetNumerator();
}
- // shorten trailing zeroes for dividend
+ // shorten trailing zeros for dividend
while(0 == (nMul % 10))
{
nUIUnitComma--;
nMul /= 10;
}
- // shorten trailing zeroes for divisor
+ // shorten trailing zeros for divisor
while(0 == (nDiv % 10))
{
nUIUnitComma++;
diff --git a/main/toolkit/workben/layout/number-format.xml
b/main/toolkit/workben/layout/number-format.xml
index 45447df989..e8efb234c0 100644
--- a/main/toolkit/workben/layout/number-format.xml
+++ b/main/toolkit/workben/layout/number-format.xml
@@ -64,7 +64,7 @@
<hbox spacing="5">
<vbox spacing="5" cnt:fill="false" cnt:expand="false">
<fixedtext id="FT_DECIMALS" _label="~Decimal places"/>
- <fixedtext id="FT_LEADZEROES" _label="Leading ~zeroes"/>
+ <fixedtext id="FT_LEADZEROES" _label="Leading ~zeros"/>
</vbox>
<vbox spacing="5" cnt:fill="false" cnt:expand="false">
<numericfield has_border="true" first="0" last="15"
minimum="0" value="2" maximum="20" repeat="true" id="ED_DECIMALS" spin="true"
spin-size="1" strict-format="true" cnt:expand="false"/>
diff --git a/main/vcl/source/fontsubset/sft.cxx
b/main/vcl/source/fontsubset/sft.cxx
index 193cac04c2..4461186f0d 100644
--- a/main/vcl/source/fontsubset/sft.cxx
+++ b/main/vcl/source/fontsubset/sft.cxx
@@ -830,7 +830,7 @@ static int GetTTGlyphOutline(TrueTypeFont *ttf, sal_uInt32
glyphID, ControlPoint
*pointArray = 0;
if (metrics) {
- memset(metrics, 0, sizeof(TTGlyphMetrics)); /*- metrics is
initialized to all zeroes */
+ memset(metrics, 0, sizeof(TTGlyphMetrics)); /*- metrics is
initialized to all zeros */
}
if (glyphID >= ttf->nglyphs) return -1; /**/
@@ -1546,7 +1546,7 @@ static void GetKern(TrueTypeFont *ttf)
#ifdef TEST5
/* KernGlyphsPrim?() functions expect the caller to ensure the validity of
their arguments and
- * that x and y elements of the kern array are initialized to zeroes
+ * that x and y elements of the kern array are initialized to zeros
*/
static void KernGlyphsPrim1(TrueTypeFont *ttf, sal_uInt16 *glyphs, int
nglyphs, int wmode, KernData *kern)
{
@@ -2340,7 +2340,7 @@ static void DumpSfnts(FILE *outf, sal_uInt8 *sfntP)
HexFmt *h = HexFmtNew(outf);
sal_uInt16 i, numTables = GetUInt16(sfntP, 4, 1);
GlyphOffsets *go = GlyphOffsetsNew(sfntP);
- sal_uInt8 pad[] = {0,0,0,0}; /* zeroes
*/
+ sal_uInt8 pad[] = {0,0,0,0}; /* zeros
*/
assert(numTables <= 9); /* Type42 has 9
required tables */
diff --git a/main/vcl/source/glyphs/gcach_rbmp.cxx
b/main/vcl/source/glyphs/gcach_rbmp.cxx
index 9aa425e759..5af40a1f8b 100644
--- a/main/vcl/source/glyphs/gcach_rbmp.cxx
+++ b/main/vcl/source/glyphs/gcach_rbmp.cxx
@@ -113,7 +113,7 @@ static void ImplRotate1_90( unsigned char* p1, const
unsigned char* p2,
for(; nTemp < 0x100U; nTemp += nTemp ) ;
*(p1++) = (unsigned char)nTemp;
}
- // pad scanline with zeroes
+ // pad scanline with zeros
for( int i = nPad; --i >= 0;)
*(p1++) = 0;
diff --git a/main/vcl/win/source/gdi/salprn.cxx
b/main/vcl/win/source/gdi/salprn.cxx
index 81b9e9f415..d412e4d7ef 100644
--- a/main/vcl/win/source/gdi/salprn.cxx
+++ b/main/vcl/win/source/gdi/salprn.cxx
@@ -1428,7 +1428,7 @@ static HDC ImplCreateSalPrnIC( WinSalInfoPrinter*
pPrinter, ImplJobSetup* pSetup
// HDU: the crashes usually happen in a MBCS to unicode conversion,
// so I suspect the MBCS string's end is not properly recognized.
// The longest MBCS encoding I'm aware of has six bytes per code
- // => add a couple of zeroes...
+ // => add a couple of zeros...
memset( lpszDriverName+aDriver.Len(), 0, 16 );
memset( lpszDeviceName+aDevice.Len(), 0, 16 );
hDC = ImplCreateICA_WithCatch( lpszDriverName,
