i18npool/source/localedata/LocaleNode.cxx | 22 ++++++++++++++++++++-- i18npool/source/localedata/data/ja_JP.xml | 7 +++++++ 2 files changed, 27 insertions(+), 2 deletions(-)
New commits: commit af25972c19bcd0bef7739bd777c67907d61b2b16 Author: Eike Rathke <er...@redhat.com> Date: Thu Jan 19 22:25:33 2012 +0100 added [ja-JP] date acceptance patterns (various) diff --git a/i18npool/source/localedata/data/ja_JP.xml b/i18npool/source/localedata/data/ja_JP.xml index 54c42a2..0b39a2c 100644 --- a/i18npool/source/localedata/data/ja_JP.xml +++ b/i18npool/source/localedata/data/ja_JP.xml @@ -35,6 +35,13 @@ <MeasurementSystem>metric</MeasurementSystem> </LC_CTYPE> <LC_FORMAT> + <DateAcceptancePattern>M-D</DateAcceptancePattern> + <DateAcceptancePattern>M/D</DateAcceptancePattern> + <DateAcceptancePattern>Mï¼D</DateAcceptancePattern> + <DateAcceptancePattern>Y.M.D</DateAcceptancePattern> + <DateAcceptancePattern>Yï¼Mï¼D</DateAcceptancePattern> + <DateAcceptancePattern>Yå¹´MæDæ¥</DateAcceptancePattern> + <DateAcceptancePattern>MæDæ¥</DateAcceptancePattern> <FormatElement msgid="FixedFormatskey1" default="true" type="short" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>Standard</FormatCode> </FormatElement> commit 0dc4e9cd0aac2d203219bb5ea4266693427c744c Author: Eike Rathke <er...@redhat.com> Date: Thu Jan 19 22:23:59 2012 +0100 added check for duplicated date acceptance patterns Also insert full date acceptance pattern at first position instead of appending to have it be first in checks. diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx index 1b1e777..42cf583 100644 --- a/i18npool/source/localedata/LocaleNode.cxx +++ b/i18npool/source/localedata/LocaleNode.cxx @@ -1185,7 +1185,8 @@ void LCFormatNode::generateCode (const OFileWriter &of) const { fprintf( stderr, "Generated date acceptance pattern: '%s' from '%s'\n", OSTR( aPattern), OSTR( sTheDateEditFormat)); - theDateAcceptancePatterns.push_back( aPattern); + // Insert at front so full date pattern is first in checks. + theDateAcceptancePatterns.insert( theDateAcceptancePatterns.begin(), aPattern); } if (aPatternBuf2.getLength() > 0) { @@ -1200,7 +1201,7 @@ void LCFormatNode::generateCode (const OFileWriter &of) const { fprintf( stderr, "Generated 2nd acceptance pattern: '%s' from '%s'\n", OSTR( aPattern2), OSTR( sTheDateEditFormat)); - theDateAcceptancePatterns.push_back( aPattern2); + theDateAcceptancePatterns.insert( theDateAcceptancePatterns.begin(), aPattern2); } } @@ -1222,6 +1223,23 @@ void LCFormatNode::generateCode (const OFileWriter &of) const } } + // Check for duplicates. + for (vector<OUString>::const_iterator aIt = theDateAcceptancePatterns.begin(); + aIt != theDateAcceptancePatterns.end(); ++aIt) + { + for (vector<OUString>::iterator aComp = theDateAcceptancePatterns.begin(); + aComp != theDateAcceptancePatterns.end(); /*nop*/) + { + if (aIt != aComp && *aIt == *aComp) + { + incErrorStr( "Duplicated DateAcceptancePattern", *aComp); + aComp = theDateAcceptancePatterns.erase( aComp); + } + else + ++aComp; + } + } + sal_Int16 nbOfDateAcceptancePatterns = static_cast<sal_Int16>(theDateAcceptancePatterns.size()); for (sal_Int16 i = 0; i < nbOfDateAcceptancePatterns; ++i)
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits