Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
f285f313
Kaydet (Commit)
f285f313
authored
Eki 27, 2017
tarafından
Eike Rathke
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Parse/gen optional <DecimalSeparatorAlternative> in locale data, tdf#81671
Change-Id: I2781040c76e7c3dbfb4eedc7830a1f24b4c56b46
üst
940808a5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
5 deletions
+14
-5
LocaleNode.cxx
i18npool/source/localedata/LocaleNode.cxx
+14
-5
No files found.
i18npool/source/localedata/LocaleNode.cxx
Dosyayı görüntüle @
f285f313
...
...
@@ -227,7 +227,7 @@ OUString LocaleNode::writeParameterCheckLen( const OFileWriter &of,
OUString
aVal
;
if
(
pNode
)
aVal
=
pNode
->
getValue
();
else
else
if
(
nMinLen
>=
0
)
// -1: optional => empty, 0: must be present, empty
{
++
nError
;
fprintf
(
stderr
,
"Error: node NULL pointer for parameter %s.
\n
"
,
...
...
@@ -246,12 +246,15 @@ OUString LocaleNode::writeParameterCheckLen( const OFileWriter &of,
OSTR
(
aVal
));
}
else
if
(
nLen
>
nMaxLen
&&
nMaxLen
>=
0
)
{
++
nError
;
fprintf
(
stderr
,
"
Warning: more than %ld character%s (%ld) in %s %s
not supported by application.
\n
"
,
"
Error: more than %ld character%s (%ld) in %s '%s'
not supported by application.
\n
"
,
sal
::
static_int_cast
<
long
>
(
nMaxLen
),
(
nMaxLen
>
1
?
"s"
:
""
),
sal
::
static_int_cast
<
long
>
(
nLen
),
(
pNode
?
OSTR
(
pNode
->
getName
())
:
""
),
OSTR
(
aVal
));
}
return
aVal
;
}
...
...
@@ -262,7 +265,7 @@ OUString LocaleNode::writeParameterCheckLen( const OFileWriter &of,
{
OUString
aVal
;
const
LocaleNode
*
pNode
=
findNode
(
pNodeName
);
if
(
pNode
)
if
(
pNode
||
nMinLen
<
0
)
aVal
=
writeParameterCheckLen
(
of
,
pParameterName
,
pNode
,
nMinLen
,
nMaxLen
);
else
{
...
...
@@ -377,6 +380,8 @@ void LCCTYPENode::generateCode (const OFileWriter &of) const
writeParameterCheckLen
(
of
,
"ThousandSeparator"
,
"thousandSeparator"
,
1
,
1
);
aDecSep
=
writeParameterCheckLen
(
of
,
"DecimalSeparator"
,
"decimalSeparator"
,
1
,
1
);
OUString
aDecSepAlt
=
writeParameterCheckLen
(
of
,
"DecimalSeparatorAlternative"
,
"decimalSeparatorAlternative"
,
-
1
,
1
);
OUString
aTimeSep
=
writeParameterCheckLen
(
of
,
"TimeSeparator"
,
"timeSeparator"
,
1
,
1
);
OUString
aTime100Sep
=
...
...
@@ -414,13 +419,16 @@ void LCCTYPENode::generateCode (const OFileWriter &of) const
fprintf
(
stderr
,
"Warning: %s
\n
"
,
"LongDateYearSeparator is empty. Usually this is not the case and may lead to concatenated display names like
\"
Wednesday, 2007May 9
\"
."
);
int
nSavErr
=
nError
;
int
nWarn
=
0
;
if
(
aDateSep
==
aTimeSep
)
incError
(
"DateSeparator equals TimeSeparator."
);
if
(
aDecSep
==
aThoSep
)
incError
(
"DecimalSeparator equals ThousandSeparator."
);
if
(
aDecSepAlt
==
aThoSep
)
incError
(
"DecimalSeparatorAlternative equals ThousandSeparator."
);
if
(
aDecSepAlt
==
aDecSep
)
incError
(
"DecimalSeparatorAlternative equals DecimalSeparator, it must not be specified then."
);
if
(
aThoSep
==
" "
)
incError
(
"ThousandSeparator is an ' ' ordinary space, this should be a non-breaking space U+00A0 instead."
);
if
(
aListSep
==
aDecSep
)
...
...
@@ -572,7 +580,8 @@ void LCCTYPENode::generateCode (const OFileWriter &of) const
of
.
writeAsciiString
(
"
\t
LongDateDayOfWeekSeparator,
\n
"
);
of
.
writeAsciiString
(
"
\t
LongDateDaySeparator,
\n
"
);
of
.
writeAsciiString
(
"
\t
LongDateMonthSeparator,
\n
"
);
of
.
writeAsciiString
(
"
\t
LongDateYearSeparator
\n
"
);
of
.
writeAsciiString
(
"
\t
LongDateYearSeparator,
\n
"
);
of
.
writeAsciiString
(
"
\t
decimalSeparatorAlternative
\n
"
);
of
.
writeAsciiString
(
"};
\n\n
"
);
of
.
writeFunction
(
"getLocaleItem_"
,
"SAL_N_ELEMENTS(LCType)"
,
"LCType"
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment