i18npool/source/localedata/LocaleNode.cxx | 10 ++++++++-- i18npool/source/localedata/data/an_ES.xml | 1 + i18npool/source/localedata/data/es_ES.xml | 1 + 3 files changed, 10 insertions(+), 2 deletions(-)
New commits: commit b5ea4471ad64cec7eda82727b6ff59c57e44eac4 Author: Eike Rathke <[email protected]> Date: Tue Jan 17 13:21:19 2012 +0100 added element name check for LC_FORMAT diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx index 6938e9e..dd07dfe 100644 --- a/i18npool/source/localedata/LocaleNode.cxx +++ b/i18npool/source/localedata/LocaleNode.cxx @@ -601,7 +601,6 @@ void LCCTYPENode::generateCode (const OFileWriter &of) const static OUString sTheCurrencyReplaceTo; static OUString sTheCompatibleCurrency; static OUString sTheDateEditFormat; -static ::std::vector< OUString > theDateAcceptancePatterns; sal_Int16 LCFormatNode::mnSection = 0; sal_Int16 LCFormatNode::mnFormats = 0; @@ -611,7 +610,7 @@ void LCFormatNode::generateCode (const OFileWriter &of) const if (mnSection >= 2) incError("more than 2 LC_FORMAT sections"); - theDateAcceptancePatterns.clear(); + ::std::vector< OUString > theDateAcceptancePatterns; OUString str; OUString strFrom( getAttr().getValueByName("replaceFrom")); @@ -670,6 +669,13 @@ void LCFormatNode::generateCode (const OFileWriter &of) const --formatCount; continue; // for } + if (!currNode->getName().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FormatElement"))) + { + incErrorStr( "Undefined element in LC_FORMAT", currNode->getName()); + --formatCount; + continue; // for + } + OUString aUsage; OUString aType; OUString aFormatIndex; commit d553f0bdd877cf11bb70e09ccd1fe2725f229732 Author: Eike Rathke <[email protected]> Date: Tue Jan 17 13:09:46 2012 +0100 added [es-ES] date acceptance pattern "D/M" diff --git a/i18npool/source/localedata/data/es_ES.xml b/i18npool/source/localedata/data/es_ES.xml index d916771..c629809 100644 --- a/i18npool/source/localedata/data/es_ES.xml +++ b/i18npool/source/localedata/data/es_ES.xml @@ -35,6 +35,7 @@ <MeasurementSystem>metric</MeasurementSystem> </LC_CTYPE> <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$â§-40A]"> + <DateAcceptancePattern>D/M</DateAcceptancePattern> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>Estandar</FormatCode> </FormatElement> commit c542fc3a4142c8f5a312a7adbdc4bae4184fffe3 Author: Eike Rathke <[email protected]> Date: Tue Jan 17 13:09:05 2012 +0100 added [an-ES] date acceptance pattern "D/M" diff --git a/i18npool/source/localedata/data/an_ES.xml b/i18npool/source/localedata/data/an_ES.xml index f7dd4fa..4227395 100644 --- a/i18npool/source/localedata/data/an_ES.xml +++ b/i18npool/source/localedata/data/an_ES.xml @@ -35,6 +35,7 @@ <MeasurementSystem>metric</MeasurementSystem> </LC_CTYPE> <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$â¬-665]"> + <DateAcceptancePattern>D/M</DateAcceptancePattern> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>General</FormatCode> </FormatElement>
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
