From bc2c3e133189b533b696d7970171ecba1645c094 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Fri, 11 Jun 2010 02:18:33 +0200 Subject: locales33a: check ordering of time separators only if both are present --- i18npool/source/localedata/LocaleNode.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'i18npool') diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx index cc183336fbc5..7a520047637d 100644 --- a/i18npool/source/localedata/LocaleNode.cxx +++ b/i18npool/source/localedata/LocaleNode.cxx @@ -697,7 +697,7 @@ void LCFormatNode::generateCode (const OFileWriter &of) const incErrorInt( "ThousandSeparator not present in FormatCode formatindex=\"%d\".", formatindex); } - if (nDec <= nGrp) + if (nDec >= 0 && nGrp >= 0 && nDec <= nGrp) incErrorInt( "Ordering of ThousandSeparator and DecimalSeparator not correct in formatindex=\"%d\".", formatindex); } @@ -732,7 +732,7 @@ void LCFormatNode::generateCode (const OFileWriter &of) const incErrorInt( "Time100SecSeparator+00 not present in FormatCode formatindex=\"%d\".", formatindex); } - if (n100s <= nTime) + if (n100s >= 0 && nTime >= 0 && n100s <= nTime) incErrorInt( "Ordering of Time100SecSeparator and TimeSeparator not correct in formatindex=\"%d\".", formatindex); } -- cgit