[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/localedata.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 896e326ace53bedf9b17fa624d260032b91bcfd1
Author: Michael Meeks
Date: Fri Dec 21 20:00:35 2012 +0100
getFunctionSymbolByName: make fall-back locale actually work
Change-Id: I7313cca3335e1b41df2a70fe968bc1e6386a1e36
diff --git a/i18npool/source/localedata/localedata.cxx
b/i18npool/source/localedata/localedata.cxx
index 7aba2a0..2c54372 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -462,7 +462,7 @@ oslGenericFunction SAL_CALL
lcl_LookupTableHelper::getFunctionSymbolByName(
for ( sal_Int16 i = 0; i < nbOfLocales; i++)
{
if (localeName.equalsAscii(aLibTable[i].pLocale) ||
-(bFallback && localeName == aFallback))
+(bFallback && aFallback.equalsAscii(aLibTable[i].pLocale)))
{
#ifndef DISABLE_DYNLOADING
LocaleDataLookupTableItem* pCurrent = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/hr_HR.xml |1 + 1 file changed, 1 insertion(+) New commits: commit fff4d120866a0be3cd8185f2c67bb9f59b1a6a3f Author: Eike Rathke Date: Wed Dec 19 12:51:37 2012 +0100 added [hr-HR] D.M.Y. date acceptance pattern (dot after year) Change-Id: Ie212f2e91b3ef262997bcd125817769ae24c16c3 diff --git a/i18npool/source/localedata/data/hr_HR.xml b/i18npool/source/localedata/data/hr_HR.xml index 24ec190..f484830 100644 --- a/i18npool/source/localedata/data/hr_HR.xml +++ b/i18npool/source/localedata/data/hr_HR.xml @@ -53,6 +53,7 @@ D.M +D.M.Y. D/M/Y D/M ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source unusedcode.easy
i18npool/source/languagetag/languagetag.cxx | 10 --
unusedcode.easy |1 -
2 files changed, 11 deletions(-)
New commits:
commit a14cc2331855c919761121c3ff234387921413ac
Author: Paula Mannes
Date: Fri Nov 30 14:12:33 2012 -0200
Removed useless method from languagetag
Change-Id: I683c54ed278d5a6ba12eaefb8040c3753a24f119
Signed-off-by: Paula Mannes
Reviewed-on: https://gerrit.libreoffice.org/1204
Reviewed-by: Olivier Hallot
Tested-by: Olivier Hallot
diff --git a/i18npool/source/languagetag/languagetag.cxx
b/i18npool/source/languagetag/languagetag.cxx
index fc5b058..94cf2e1 100644
--- a/i18npool/source/languagetag/languagetag.cxx
+++ b/i18npool/source/languagetag/languagetag.cxx
@@ -70,7 +70,6 @@ public:
if (mnRef != SAL_MAX_UINT32 && mnRef && !--mnRef)
teardown();
}
-void presetDataPath( const rtl::OUString& rPath );
private:
rtl::OString maDataPath; // path to liblangtag data, "|" if system
sal_uInt32 mnRef;
@@ -112,15 +111,6 @@ void LiblantagDataRef::teardown()
lt_db_finalize();
}
-void LiblantagDataRef::presetDataPath( const rtl::OUString& rPath )
-{
-if (maDataPath.isEmpty())
-{
-maDataPath = OUStringToOString( rPath, RTL_TEXTENCODING_UTF8);
-lt_db_set_datadir( maDataPath.getStr());
-}
-}
-
void LiblantagDataRef::setupDataPath()
{
// maDataPath is assumed to be empty here.
diff --git a/unusedcode.easy b/unusedcode.easy
index a3e78d5..fa6e588 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,6 +1,5 @@
FontSelectPattern::FontSelectPattern(PhysicalFontFace const&, Size const&,
float, int, bool)
GraphicObject::SwapIn(SvStream*)
-LiblantagDataRef::presetDataPath(rtl::OUString const&)
Line::GetLength() const
Line::Intersection(Rectangle const&, Line&) const
PoHeader::getLanguage() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/languagetag/languagetag.cxx |9 - 1 file changed, 8 insertions(+), 1 deletion(-) New commits: commit a4471c3321105d062f7e3f894065eace5574ff9a Author: Eike Rathke Date: Thu Nov 22 17:51:11 2012 +0100 exclude language(-Script) only tags from pRegionT==NULL check Change-Id: Ie5423578e34a295aad3a03d2b29f3a6b1a6572ce diff --git a/i18npool/source/languagetag/languagetag.cxx b/i18npool/source/languagetag/languagetag.cxx index cc9fc55..7f3c15e 100644 --- a/i18npool/source/languagetag/languagetag.cxx +++ b/i18npool/source/languagetag/languagetag.cxx @@ -584,7 +584,14 @@ rtl::OUString LanguageTag::getRegionFromLangtag() const if (maBcp47.isEmpty()) return aRegion; const lt_region_t* pRegionT = lt_tag_get_region( MPLANGTAG); -SAL_WARN_IF( !pRegionT, "i18npool.langtag", "LanguageTag::getRegionFromLangtag: pRegionT==NULL"); +// pRegionT==NULL is valid for language only tags, rough check here that +// does not take sophisticated tags into account that actually should have +// a region, check for ll, lll, ll-Ssss and lll-Ssss so that ll-CC and +// lll-CC actually fail. +SAL_WARN_IF( !pRegionT && +maBcp47.getLength() != 2 && maBcp47.getLength() != 3 && +maBcp47.getLength() != 7 && maBcp47.getLength() != 8, +"i18npool.langtag", "LanguageTag::getRegionFromLangtag: pRegionT==NULL"); if (!pRegionT) return aRegion; const char* pRegion = lt_region_get_tag( pRegionT); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/isolang/inunx.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 9de9c430ca36751b63744ccb2f31e5b075e599b0 Author: Stephan Bergmann Date: Tue Nov 20 17:09:39 2012 +0100 Blind fix for MACOSX-only MsLangId::convertIsoNamesToLanguage leftover Change-Id: Iec2845cb3717520e1126ac4e9743413d5f3a5119 diff --git a/i18npool/source/isolang/inunx.cxx b/i18npool/source/isolang/inunx.cxx index eb61f0b..778446a 100644 --- a/i18npool/source/isolang/inunx.cxx +++ b/i18npool/source/isolang/inunx.cxx @@ -30,6 +30,7 @@ #endif // MACOSX #include +#include "i18npool/languagetag.hxx" #include "i18npool/mslangid.hxx" // === @@ -101,7 +102,7 @@ static void getPlatformSystemLanguageImpl( LanguageType& rSystemLanguage, rtl::OUString rLang( procLocale->Language ); rtl::OUString rCountry( procLocale->Country ); -nLang = MsLangId::convertIsoNamesToLanguage( rLang, rCountry ); +nLang = LanguageTag( rLang, rCountry ).getLanguageType(); OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER(); rSystemLanguage = nLang; #ifdef DEBUG ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/he_IL.xml |9 - 1 file changed, 8 insertions(+), 1 deletion(-) New commits: commit dcbf9238ba3354aafbcbfa0c15980587cf31fe96 Author: Lior Kaplan Date: Fri Nov 9 23:33:41 2012 +0100 fdo#46807: Add LRM before Shekel sign, forcing it to appear left of numbers introducing new Currency element and marking previous as legacyOnly Change-Id: I40a762bf03a15f241fc80279bb61be9a2710d2f0 Reviewed-on: https://gerrit.libreoffice.org/967 Reviewed-by: Lior Kaplan Tested-by: Lior Kaplan Reviewed-by: Eike Rathke diff --git a/i18npool/source/localedata/data/he_IL.xml b/i18npool/source/localedata/data/he_IL.xml index e8ddb3e..4adbbc8 100644 --- a/i18npool/source/localedata/data/he_IL.xml +++ b/i18npool/source/localedata/data/he_IL.xml @@ -51,7 +51,7 @@ PM metric - + D/M D/M/YY @@ -414,6 +414,13 @@ ILS + â⪠+ ILS + New Israeli Sheqel + 2 + + + ILS ⪠ILS New Israeli Sheqel ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/locale.dtd |8 1 file changed, 8 insertions(+) New commits: commit 628ec2a1ce1370b04b832437fce9a661f3d8f754 Author: Eike Rathke Date: Wed Nov 7 15:52:25 2012 +0100 enhance documentation of Currency legacyOnly attribute Change-Id: I05f2f5e51490b6830a01fe72b11dd9da174719fd diff --git a/i18npool/source/localedata/data/locale.dtd b/i18npool/source/localedata/data/locale.dtd index 6575eb3..d044801 100644 --- a/i18npool/source/localedata/data/locale.dtd +++ b/i18npool/source/localedata/data/locale.dtd @@ -395,6 +395,14 @@ documents and is not selectable in the UI otherwise. Defaults to "false" if not specified. If this attribute is "true", 'default' and 'usedInCompatibleFormatCodes' must both be "false". + + Currency elements must not be changed to contain only a different + CurrencySymbol element without changing the CurrencyID and BankSymbol + elements, instead the entire Currency element must be duplicated, the old + element needs this 'legacyOnly' attribute be added and 'default' and + 'usedInCompatibleFormatCodes' attributes must be set to "false", and only + in the new duplicated Currency element the CurrencySymbol element be + changed. --> ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/languagetag/simple-langtag.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit eb66f794d96a78cfca575f858bc9c65d1dee43b7
Author: Tor Lillqvist
Date: Wed Nov 7 00:40:06 2012 +0200
Put the __attribute__ in the correct place
Change-Id: I8444fe62254cefe950f356e2f0bca5625420cd75
diff --git a/i18npool/source/languagetag/simple-langtag.cxx
b/i18npool/source/languagetag/simple-langtag.cxx
index 5d51bd9..849f37a 100644
--- a/i18npool/source/languagetag/simple-langtag.cxx
+++ b/i18npool/source/languagetag/simple-langtag.cxx
@@ -45,7 +45,7 @@ static void g_free(gpointer p)
free(p);
}
-static void g_error_free(GError *error) __attribute__((used))
+static void __attribute__((used)) g_error_free(GError *error)
{
if (error)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/languagetag/simple-langtag.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 7b58bf4c0bd6614e8ebf8d4fee880a235834323c
Author: Tor Lillqvist
Date: Tue Nov 6 18:55:05 2012 +0200
Try to unbreak the Android build
Change-Id: I8fd77369cab201cd8ba2681398c23e81b186418f
diff --git a/i18npool/source/languagetag/simple-langtag.cxx
b/i18npool/source/languagetag/simple-langtag.cxx
index d05ab42..5d51bd9 100644
--- a/i18npool/source/languagetag/simple-langtag.cxx
+++ b/i18npool/source/languagetag/simple-langtag.cxx
@@ -32,6 +32,8 @@ struct GError {
GError() : message(NULL) {}
};
+typedef struct GError lt_error_t;
+
static gpointer g_malloc(size_t s)
{
return malloc(s);
@@ -43,7 +45,7 @@ static void g_free(gpointer p)
free(p);
}
-static void g_error_free(GError *error)
+static void g_error_free(GError *error) __attribute__((used))
{
if (error)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/ordinalsuffix/ordinalsuffix.cxx |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit fdc76a03f50e1291a90035befac67b8205c7e770 Author: Caolán McNamara Date: Tue Nov 6 15:13:46 2012 + WaE: duplicated variable name Change-Id: Id42116f2ddfe679b1a995590e35a619ff8d82d7e diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx index 03663b6..558429a 100644 --- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx +++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx @@ -89,8 +89,8 @@ uno::Sequence< OUString > SAL_CALL OrdinalSuffix::getOrdinalSuffix( sal_Int32 nN icu::UnicodeString sFormatWithNoOrdinal; icu::Formattable ftmNumber((int32_t)nNumber); -icu::FieldPosition icuPos; -xNumberFormat->format(ftmNumber, sFormatWithNoOrdinal, icuPos, nCode); +icu::FieldPosition icuPosA; +xNumberFormat->format(ftmNumber, sFormatWithNoOrdinal, icuPosA, nCode); if (!U_SUCCESS(nCode)) return retValue; @@ -105,8 +105,8 @@ uno::Sequence< OUString > SAL_CALL OrdinalSuffix::getOrdinalSuffix( sal_Int32 nN // format the string icu::UnicodeString sFormatWithOrdinal; -icu::FieldPosition icuPos; -formatter.format( (int32_t)nNumber, ruleSet, sFormatWithOrdinal, icuPos, nCode ); +icu::FieldPosition icuPosB; +formatter.format((int32_t)nNumber, ruleSet, sFormatWithOrdinal, icuPosB, nCode); if (!U_SUCCESS(nCode)) continue; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/he_IL.xml | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit 087f8ca17e94ffb3b1525a4d6e9be1c6b81184f7 Author: Lior Kaplan Date: Thu Nov 1 18:11:51 2012 +0200 Consolidate ⪠appearances to a CURRENCY template Change-Id: Ibde3ac38e27e5abb42aa5d538762a3a5a7401f2b Reviewed-on: https://gerrit.libreoffice.org/966 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/i18npool/source/localedata/data/he_IL.xml b/i18npool/source/localedata/data/he_IL.xml index 378b489..e8ddb3e 100644 --- a/i18npool/source/localedata/data/he_IL.xml +++ b/i18npool/source/localedata/data/he_IL.xml @@ -51,7 +51,7 @@ PM metric - + D/M D/M/YY @@ -172,22 +172,22 @@ #,###.00 - [$âª-40D] #,##0;[$âª-40D] -#,##0 + [CURRENCY] #,##0;[CURRENCY] -#,##0 - [$âª-40D] #,##0.00;[$âª-40D] -#,##0.00 + [CURRENCY] #,##0.00;[CURRENCY] -#,##0.00 - [$âª-40D] #,##0;[RED][$âª-40D] -#,##0 + [CURRENCY] #,##0;[RED][CURRENCY] -#,##0 - [$âª-40D] #,##0.00;[RED][$âª-40D] -#,##0.00 + [CURRENCY] #,##0.00;[RED][CURRENCY] -#,##0.00 #,##0.00 CCC - [$âª-40D] #,##0.--;[RED][$âª-40D] -#,##0.-- + [CURRENCY] #,##0.--;[RED][CURRENCY] -#,##0.-- 0% ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/nativenumber/nativenumbersupplier.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 30762128a8cbe218433a7d44c04b308809c9bd48
Author: Lior Kaplan
Date: Sat Oct 27 14:31:45 2012 +0200
Update reference link for Hebrew Numbering System
Change-Id: I5b761341b1bfbd3462ab5ffa21608182584f757a
diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx
b/i18npool/source/nativenumber/nativenumbersupplier.cxx
index 8c10f0f..8632b5d 100644
--- a/i18npool/source/nativenumber/nativenumbersupplier.cxx
+++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx
@@ -792,7 +792,7 @@ sal_Int16 SAL_CALL
NativeNumberSupplier::convertFromXmlAttributes( const NativeN
// Following code generates Hebrew Number,
// see numerical system in the Hebrew Numbering System in following link for
details,
-// http://people.netscape.com/smontagu/writings/HebrewNumbers.html
+// http://smontagu.org/writings/HebrewNumbers.html
struct HebrewNumberChar {
sal_Unicode code;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx |4
++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e89c99a8ce264173a9d9cbb6df09d7811d6b34cc
Author: Lester
Date: Tue Oct 23 15:27:33 2012 -0400
fdo#55732 display upper case greek letters in page numbering option
\n\nAll of the code for the constant defining greek upper case page
numbering is correct, but the UI dialog that represents that constant displayed
lower case greek letters, and vice versa. So, the dialog should display the
proper characters.
Change-Id: Ib8d0a41928796fbed5f36162c35d6e1db2463e07
Reviewed-on: https://gerrit.libreoffice.org/904
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git
a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 4cb947c..e0ef03a 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -934,8 +934,8 @@ static const Supported_NumberingType aSupportedTypes[] =
{style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_N_SR, S_CYR_A ", "
S_CYR_B ", .., " S_CYR_A S_CYR_A ", " S_CYR_B S_CYR_B ", ... (sr)", LANG_ALL},
{style::NumberingType::CHARS_PERSIAN, NULL, LANG_CTL},
{style::NumberingType::CHARS_PERSIAN_WORD, NULL, LANG_CTL},
-{style::NumberingType::CHARS_GREEK_LOWER_LETTER, C_GR_A ", " C_GR_B
", ... (gr)", LANG_ALL},
-{style::NumberingType::CHARS_GREEK_UPPER_LETTER, S_GR_A ", " S_GR_B
", ... (gr)", LANG_ALL},
+{style::NumberingType::CHARS_GREEK_UPPER_LETTER, C_GR_A ", " C_GR_B
", ... (gr)", LANG_ALL},
+{style::NumberingType::CHARS_GREEK_LOWER_LETTER, S_GR_A ", " S_GR_B
", ... (gr)", LANG_ALL},
};
static const sal_Int32 nSupported_NumberingTypes = sizeof(aSupportedTypes) /
sizeof(Supported_NumberingType);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/genstaticheader.pl | 19 +--
i18npool/source/localedata/localedata.cxx |2 ++
2 files changed, 19 insertions(+), 2 deletions(-)
New commits:
commit 122f3e7e68c7679579309338d3f4befa3a0ba9f3
Author: Tor Lillqvist
Date: Tue Oct 23 16:36:54 2012 +0300
Handle getAllFormats1, too, but it exists only for en_US
Change-Id: Ia8de5f1a619466e473f7a9586f53a38bdf9c2e51
diff --git a/i18npool/source/localedata/genstaticheader.pl
b/i18npool/source/localedata/genstaticheader.pl
index adba340..3d99358 100644
--- a/i18npool/source/localedata/genstaticheader.pl
+++ b/i18npool/source/localedata/genstaticheader.pl
@@ -44,6 +44,7 @@ my @FUNCS = qw(
getSearchOptions
getTransliterations
getUnicodeScripts
+getAllFormats1
);
print 'extern "C" {
@@ -52,7 +53,13 @@ print 'extern "C" {
foreach my $lang (@ARGV) {
foreach my $func (@FUNCS) {
- printf("void %s_%s();\n", $func, $lang);
+if ($func eq 'getAllFormats1') {
+if ($lang eq 'en_US') {
+printf("void %s_%s();\n", $func, $lang);
+}
+} else {
+printf("void %s_%s();\n", $func, $lang);
+}
}
}
@@ -70,7 +77,15 @@ foreach my $lang (@ARGV) {
printf("{\n");
printf("\"%s\",\n", $lang);
foreach my $func (@FUNCS) {
- printf("%s_%s,\n", $func, $lang);
+if ($func eq 'getAllFormats1') {
+if ($lang eq 'en_US') {
+printf("%s_%s,\n", $func, $lang);
+} else {
+printf("0,\n");
+}
+} else {
+printf("%s_%s,\n", $func, $lang);
+}
}
printf("}%s\n", ($lang ne $ARGV[$#ARGV]) ? ',' : '');
}
diff --git a/i18npool/source/localedata/localedata.cxx
b/i18npool/source/localedata/localedata.cxx
index 0fff9cf..300c5e1 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -533,6 +533,8 @@ oslGenericFunction SAL_CALL
lcl_LookupTableHelper::getFunctionSymbolByName(
return aLibTable[i].getTransliterations;
else if( strcmp(pFunction, "getUnicodeScripts") == 0 )
return aLibTable[i].getUnicodeScripts;
+else if( strcmp(pFunction, "getAllFormats1") == 0 )
+return aLibTable[i].getAllFormats1;
#endif
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/hr_HR.xml | 62 ++ 1 file changed, 62 insertions(+) New commits: commit 46caf0e07b42fa83215d49fde64a8b16d73d3a21 Author: Neven ÄosiÄ Date: Mon Oct 8 01:55:56 2012 +0200 add Croatian [hr-HR] genitive case month names Change-Id: Ic6c178153a64daf975af2495779b04b798a6381f diff --git a/i18npool/source/localedata/data/hr_HR.xml b/i18npool/source/localedata/data/hr_HR.xml index 75f497b..80f92e1 100644 --- a/i18npool/source/localedata/data/hr_HR.xml +++ b/i18npool/source/localedata/data/hr_HR.xml @@ -307,6 +307,68 @@ prosinac + + + jan + sij + sijeÄnja + + + feb + velj + veljaÄe + + + mar + ožu + ožujka + + + apr + tra + travnja + + + may + svi + svibnja + + + jun + lip + lipnja + + + jul + srp + srpnja + + + aug + kol + kolovoza + + + sep + ruj + rujna + + + oct + lis + listopada + + + nov + stu + studenog + + + dec + pro + prosinca + + bc ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/languagetag/languagetag.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 39d6c353fb40e6c20fc69d5d3c07181d2ef1dd45
Author: Stephan Bergmann
Date: Fri Oct 5 16:50:13 2012 +0200
Turn a SAL_WARN into SAL_INFO
...as lingucomponent GetOldStyleDics SYSTEM_DICTS code harmlessly triggers
it
routinely with input containing _ and then fixing the input.
Change-Id: Id00857f0b89eb65ad155e8cf0883dd2f45851c7d
diff --git a/i18npool/source/languagetag/languagetag.cxx
b/i18npool/source/languagetag/languagetag.cxx
index df1533b..14cad58 100644
--- a/i18npool/source/languagetag/languagetag.cxx
+++ b/i18npool/source/languagetag/languagetag.cxx
@@ -342,8 +342,10 @@ bool LanguageTag::canonicalize() const
}
else
{
-SAL_WARN( "i18npool.langtag", "LanguageTag::canonicalize: could not
parse, " <<
-(aError.p ? aError.p->message : ""));
+SAL_INFO(
+"i18npool.langtag",
+"LanguageTag::canonicalize " << maBcp47 << ": could not parse, "
+<< (aError.p ? aError.p->message : ""));
}
meIsValid = DECISION_NO;
return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/hu_HU.xml |2 ++ 1 file changed, 2 insertions(+) New commits: commit a07a4688d10737bd88d89ef38e12bc9b6074ffea Author: László Németh Date: Sat Sep 29 00:05:34 2012 +0200 Add back compatible Hungarian date format acceptance Change-Id: I6b6d62cda241250db89cdcabaa04952d36e1acfd Reviewed-on: https://gerrit.libreoffice.org/720 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/i18npool/source/localedata/data/hu_HU.xml b/i18npool/source/localedata/data/hu_HU.xml index 2345e31..2b5d5ba 100644 --- a/i18npool/source/localedata/data/hu_HU.xml +++ b/i18npool/source/localedata/data/hu_HU.xml @@ -52,6 +52,8 @@ metric +M-D +M.D Standard ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/textconversion/textconversion_ko.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 0d4c44bb9a9283778abd4be52c44b76bcf6a068c
Author: Tor Lillqvist
Date: Fri Sep 14 16:03:08 2012 +0300
GCC/Clang pragma dance
Change-Id: I42f9f45bffbbc74784eb78580a5b927aa3d3ffd7
diff --git a/i18npool/source/textconversion/textconversion_ko.cxx
b/i18npool/source/textconversion/textconversion_ko.cxx
index 2d13c1e..dfb21e0 100644
--- a/i18npool/source/textconversion/textconversion_ko.cxx
+++ b/i18npool/source/textconversion/textconversion_ko.cxx
@@ -142,11 +142,13 @@ TextConversion_ko::getCharConversions(const OUString&
aText, sal_Int32 nStartPos
#else
#ifdef LIBO_WERROR
#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpragmas"
+#ifdef __clang__
#pragma GCC diagnostic warning "-Wbool-conversions"
+#else
#pragma GCC diagnostic warning "-Waddress"
#endif
#endif
+#endif
if (toHanja && getHangul2HanjaIndex && getHangul2HanjaIndexCount &&
getHangul2HanjaData) {
ch = aText[nStartPos];
const Hangul_Index *Hangul_ko = getHangul2HanjaIndex();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/textconversion/textconversion_ko.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 0fb18d82742f704017768d342180e0bb2943c3aa
Author: Tor Lillqvist
Date: Fri Sep 14 13:45:17 2012 +0300
It seems gcc has -Waddress where Clang has -Wbool-conversions
Change-Id: Ic5ddaf436592c1112cb9b3a1b36d2026caddf368
diff --git a/i18npool/source/textconversion/textconversion_ko.cxx
b/i18npool/source/textconversion/textconversion_ko.cxx
index 334de83..2d13c1e 100644
--- a/i18npool/source/textconversion/textconversion_ko.cxx
+++ b/i18npool/source/textconversion/textconversion_ko.cxx
@@ -142,7 +142,9 @@ TextConversion_ko::getCharConversions(const OUString&
aText, sal_Int32 nStartPos
#else
#ifdef LIBO_WERROR
#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpragmas"
#pragma GCC diagnostic warning "-Wbool-conversions"
+#pragma GCC diagnostic warning "-Waddress"
#endif
#endif
if (toHanja && getHangul2HanjaIndex && getHangul2HanjaIndexCount &&
getHangul2HanjaData) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/ordinalsuffix/ordinalsuffix.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ddeeac32bf2af605ee6fd140e9a4e5ee45684317 Author: Caolán McNamara Date: Thu Sep 6 15:40:28 2012 +0100 use OUString::startsWith instead of OUString::match Change-Id: I6b88baf83bfce1c28955b445c2c2ddd690cfed2d diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx index e74fa03..6dd7053 100644 --- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx +++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx @@ -116,7 +116,7 @@ uno::Sequence< OUString > SAL_CALL OrdinalSuffix::getOrdinalSuffix( sal_Int32 nN // fdo#54486 lets make sure that the ordinal format and the non-ordinal // format match at the start, so that the expectation can be verified // that there is some trailing "ordinal suffix" which can be extracted -bool bSimpleOrdinalSuffix = sValueWithOrdinal.match(sValueWithNoOrdinal); +bool bSimpleOrdinalSuffix = sValueWithOrdinal.startsWith(sValueWithNoOrdinal); SAL_WARN_IF(!bSimpleOrdinalSuffix, "i18npool", "ordinal " << sValueWithOrdinal << " didn't start with expected " << ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/ordinalsuffix/ordinalsuffix.cxx | 102
1 file changed, 69 insertions(+), 33 deletions(-)
New commits:
commit a05357ab69712bec53c2d8d17efbbf25907ff9b8
Author: Caolán McNamara
Date: Wed Sep 5 11:31:10 2012 +0100
Resolves: fdo#54486 ensure ordinal format has non-ordinal prefix
Make sure that the ordinal format and the non-ordinal format match at the
start, so that the expectation can be verified that there is some trailing
"ordinal suffix" which can be extracted.
I'm not at all sure that this will be true for all languages.
Change-Id: Ib89a51cdd743db12bfe6e723a9acb61d9fe5e6ce
diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
index 4d75b0f..e74fa03 100644
--- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
+++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include
#include
#include
#include "ordinalsuffix.hxx"
@@ -44,6 +45,23 @@ OrdinalSuffix::~OrdinalSuffix()
{
}
+namespace
+{
+OUString mungeUnicodeStringToOUString(const icu::UnicodeString &rIn,
UErrorCode &rCode)
+{
+// Apply NFKC normalization to get normal letters
+icu::UnicodeString normalized;
+icu::Normalizer::normalize(rIn, UNORM_NFKC, 0, normalized, rCode);
+// Convert the normalized UnicodeString to OUString
+OUString sRet = (U_SUCCESS(rCode))
+? OUString(reinterpret_cast(normalized.getBuffer()), normalized.length())
+: OUString();
+// replace any minus signs with hyphen-minus so that negative numbers
+// from the simple number formatter and heavy-duty pattern formatter
+// agree as to their negative number sign
+return sRet.replace(0x2212, '-');
+}
+}
/*
* For this method to properly return the ordinal suffix for other locales
@@ -60,46 +78,64 @@ uno::Sequence< OUString > SAL_CALL
OrdinalSuffix::getOrdinalSuffix( sal_Int32 nN
CSTR( aLocale.Language ),
CSTR( aLocale.Country ),
CSTR( aLocale.Variant ) );
-icu::RuleBasedNumberFormat formatter(
-icu::URBNF_ORDINAL, rIcuLocale, nCode );
-if ( U_SUCCESS( nCode ) )
+icu::RuleBasedNumberFormat formatter(icu::URBNF_ORDINAL, rIcuLocale,
nCode);
+if (!U_SUCCESS(nCode))
+return retValue;
+
+boost::scoped_ptr
xNumberFormat(icu::NumberFormat::createInstance(rIcuLocale, nCode));
+if (!U_SUCCESS(nCode))
+return retValue;
+
+icu::UnicodeString sFormatWithNoOrdinal;
+xNumberFormat->format((int32_t)nNumber, sFormatWithNoOrdinal, NULL, nCode);
+if (!U_SUCCESS(nCode))
+return retValue;
+
+OUString sValueWithNoOrdinal =
mungeUnicodeStringToOUString(sFormatWithNoOrdinal, nCode);
+if (!U_SUCCESS(nCode))
+return retValue;
+
+int32_t nRuleSets = formatter.getNumberOfRuleSetNames( );
+for (int32_t i = 0; i < nRuleSets; ++i)
{
-int32_t nRuleSets = formatter.getNumberOfRuleSetNames( );
-for ( int32_t i = 0; i < nRuleSets; i++ )
-{
-icu::UnicodeString ruleSet = formatter.getRuleSetName( i );
-// format the string
-icu::UnicodeString icuRet;
-icu::FieldPosition icuPos;
-formatter.format( (int32_t)nNumber, ruleSet, icuRet, icuPos, nCode
);
-
-if ( U_SUCCESS( nCode ) )
-{
-// Apply NFKC normalization to get normal letters
-icu::UnicodeString normalized;
-nCode = U_ZERO_ERROR;
-icu::Normalizer::normalize( icuRet, UNORM_NFKC, 0, normalized,
nCode );
-if ( U_SUCCESS( nCode ) )
-{
-// Convert the normalized UnicodeString to OUString
-OUString sValue( reinterpret_cast(
normalized.getBuffer( ) ), normalized.length() );
-
-// Remove the number to get the prefix
-sal_Int32 len = OUString::valueOf( nNumber ).getLength( );
-
-sal_Int32 newLength = retValue.getLength() + 1;
-retValue.realloc( newLength );
-retValue[ newLength - 1 ] = sValue.copy( len );
-}
-}
-}
+icu::UnicodeString ruleSet = formatter.getRuleSetName(i);
+
+// format the string
+icu::UnicodeString sFormatWithOrdinal;
+icu::FieldPosition icuPos;
+formatter.format( (int32_t)nNumber, ruleSet, sFormatWithOrdinal,
icuPos, nCode );
+
+if (!U_SUCCESS(nCode))
+continue;
+
+OUString sValueWithOrdinal =
mungeUnicodeStringToOUString(sFormatWithOrdinal, nCode);
+if (!U_SUCCESS(nCode))
+continue;
+
+// fdo#54486 lets make sure that the ordinal format and the non-ordinal
+// format match at the start,
[Libreoffice-commits] .: i18npool/source
i18npool/source/textconversion/data/stc_char.dic |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3224b47493a40eba67e454b4bde7fab334cb5298 Author: Liu Flex Date: Tue Sep 4 11:45:23 2012 +0800 fdo#46182: Error in Simplified to Traditional Chinese Conversion This patch just fix the mistake in Simplified to Traditional Chinese Conversion. >From 1bb88fe0ae13733cf6269fcc442ee18bf41b21ff Mon Sep 17 00:00:00 2001 From: Flex Liu Date: Tue, 4 Sep 2012 11:28:37 +0800 Subject: [PATCH] fdo#46182 Error in Simplified to Traditional Chinese Conversion fix the conversion mistake for Simplified to Traditional Chinese Committer: Flex Liu modified: i18npool/source/textconversion/data/stc_char.dic diff --git a/i18npool/source/textconversion/data/stc_char.dic b/i18npool/source/textconversion/data/stc_char.dic index 32c2b3c..92a06f2 100644 --- a/i18npool/source/textconversion/data/stc_char.dic +++ b/i18npool/source/textconversion/data/stc_char.dic @@ -295,7 +295,7 @@ å:åå« å:åé¤ å:å¼å -å:è¡ +å:åè¡ å:åå¾ å:åå®æ å:å ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source solenv/gbuild
i18npool/source/languagetag/languagetag.cxx |3 ++-
solenv/gbuild/CppunitTest.mk|1 +
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit f7347f2eddb9e0b1dc1e3478e9f1efe07355067e
Author: Caolán McNamara
Date: Fri Aug 31 13:41:26 2012 +0100
stuff in a mechanism to find the liblangtag share dir during unit tests
Change-Id: Idf67c3dfbff7ee5c13831159a913ce8a517732ca
diff --git a/i18npool/source/languagetag/languagetag.cxx
b/i18npool/source/languagetag/languagetag.cxx
index 9c64b7c..df1533b 100644
--- a/i18npool/source/languagetag/languagetag.cxx
+++ b/i18npool/source/languagetag/languagetag.cxx
@@ -114,7 +114,8 @@ void LiblantagDataRef::setupDataPath()
{
// maDataPath is assumed to be empty here.
OUString aURL;
-if (!rtl::Bootstrap::get( "BRAND_BASE_DIR", aURL))
+
+if (!rtl::Bootstrap::get("BRAND_BASE_DIR", aURL) &&
!rtl::Bootstrap::get("LIBLANGTAG_SHARE", aURL))
OSL_FAIL( "LiblantagDataRef: can't get BRAND_BASE_DIR");
else
{
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index feaec22..ef8f320 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -59,6 +59,7 @@ gb_CppunitTest__get_linktargetname = CppunitTest/$(call
gb_CppunitTest_get_filen
define gb_CppunitTest__make_args
--headless \
+"-env:LIBLANGTAG_SHARE=$(call gb_Helper_make_url,$(OUTDIR))" \
$(if $(URE),\
$(if $(strip $(CONFIGURATION_LAYERS)),\
"-env:CONFIGURATION_LAYERS=$(strip $(CONFIGURATION_LAYERS))") \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/languagetag/languagetag.cxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit 7e36822b706f3da04cec7c57d319b06a5f2e07df
Author: Eike Rathke
Date: Fri Aug 31 13:20:17 2012 +0200
removed nonsense incRef() in operator=()
Change-Id: I62e330ff47a60cc0acaf6deb3cd1011c7deb3f45
diff --git a/i18npool/source/languagetag/languagetag.cxx
b/i18npool/source/languagetag/languagetag.cxx
index 9eae6ea..9c64b7c 100644
--- a/i18npool/source/languagetag/languagetag.cxx
+++ b/i18npool/source/languagetag/languagetag.cxx
@@ -249,8 +249,6 @@ LanguageTag::LanguageTag( const LanguageTag & rLanguageTag )
LanguageTag& LanguageTag::operator=( const LanguageTag & rLanguageTag )
{
-theDataRef.incRef();
-
maLocale= rLanguageTag.maLocale;
maBcp47 = rLanguageTag.maBcp47;
maCachedLanguage= rLanguageTag.maCachedLanguage;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/hr_HR.xml |1 + 1 file changed, 1 insertion(+) New commits: commit c2b40d6fa57e0176d52ec4ac0565de352064c661 Author: Eike Rathke Date: Tue Aug 28 13:35:53 2012 +0200 fdo#52240 added D.M date acceptance pattern to [hr-HR] Change-Id: I682bd186b571973acbe98a00af7f6a83ce83e9d4 diff --git a/i18npool/source/localedata/data/hr_HR.xml b/i18npool/source/localedata/data/hr_HR.xml index 53f7417..75f497b 100644 --- a/i18npool/source/localedata/data/hr_HR.xml +++ b/i18npool/source/localedata/data/hr_HR.xml @@ -52,6 +52,7 @@ Metric +D.M MM.YY ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/breakiterator/data/README |3 +++ 1 file changed, 3 insertions(+) New commits: commit 5d1d4c940ad47ec3dacdf40d82b40836c99e02c3 Author: Caolán McNamara Date: Tue Aug 28 10:48:57 2012 +0100 document what the three FOO_word things are for Change-Id: Ie93c06a9304fd45a1c0c10af81cc09c88baf106f diff --git a/i18npool/source/breakiterator/data/README b/i18npool/source/breakiterator/data/README index 8967c73..e50b061 100644 --- a/i18npool/source/breakiterator/data/README +++ b/i18npool/source/breakiterator/data/README @@ -2,6 +2,9 @@ The originals of these come from svn checkout http://source.icu-project.org/repos/icu/icu/trunk/source/data/brkitr they no longer appear in the icu tarballs, but are in icu's svn +dict_word is used for dictionary word break, edit_word is for cursor +travelling, while count_word is for word count. + At various stages these copies have been customized and are now horribly out of sync. It unclear which diffs from the base versions are deliberate and which are now accidental :-( ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
0 files changed New commits: commit 28f04b0aa2239d2e1a38f5923b941ce6b0c3270f Author: Eike Rathke Date: Wed Aug 22 14:01:02 2012 +0200 restore executable permission was lost with 2c47c9989e308ddef22066607795eb3feef9f76b Change-Id: Iee6f2caa2e934ed998c186e12a3f8b433fb64574 diff --git a/i18npool/source/isolang/langid.pl b/i18npool/source/isolang/langid.pl old mode 100644 new mode 100755 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/sv_SE.xml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 789b162cce8ad306861344e8497eab460983440b Author: Albert Thuswaldner Date: Mon Aug 13 22:08:23 2012 +0200 fdo#35323 - fix for The standard date format for Swedish is wrong Change-Id: I967b75b54a330692fb88783609e714d016506f89 diff --git a/i18npool/source/localedata/data/sv_SE.xml b/i18npool/source/localedata/data/sv_SE.xml index 3af71e3..7574a63 100644 --- a/i18npool/source/localedata/data/sv_SE.xml +++ b/i18npool/source/localedata/data/sv_SE.xml @@ -102,13 +102,13 @@ #Â ##0,-- [CURRENCY];[RED]-#Â ##0,-- [CURRENCY] - + -MM-DD D - + YY-MM-DD ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/pt_PT.xml |3 +++ 1 file changed, 3 insertions(+) New commits: commit 01e1f4eca5f89d685769833076df440a202b6a08 Author: Eike Rathke Date: Mon Aug 13 13:51:27 2012 +0200 added -MM-DD HH:MM format code to [pt-PT] Change-Id: I294c9b665a9314169515fe20b97b4558580662e9 diff --git a/i18npool/source/localedata/data/pt_PT.xml b/i18npool/source/localedata/data/pt_PT.xml index 1908218..98a9b56 100644 --- a/i18npool/source/localedata/data/pt_PT.xml +++ b/i18npool/source/localedata/data/pt_PT.xml @@ -159,6 +159,9 @@ DD-MM- HH:MM:SS + + -MM-DD HH:MM + Geral ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/languagetag/languagetag.cxx|4 ++-- i18npool/source/languagetag/simple-langtag.cxx |1 + 2 files changed, 3 insertions(+), 2 deletions(-) New commits: commit b844b3d6b17ad9e77615923bc5d024dd1769a80a Author: Eike Rathke Date: Thu Aug 9 21:37:38 2012 +0200 lt_tag_dump() only used to debug [-Werror=unused-function] diff --git a/i18npool/source/languagetag/languagetag.cxx b/i18npool/source/languagetag/languagetag.cxx index d7c6b0f..caaf0cc 100644 --- a/i18npool/source/languagetag/languagetag.cxx +++ b/i18npool/source/languagetag/languagetag.cxx @@ -13,6 +13,8 @@ #include #include +//#define erDEBUG + #if !defined(ANDROID) && !defined(IOS) #include #else @@ -24,8 +26,6 @@ #include "simple-langtag.cxx" #endif -//#define erDEBUG - using rtl::OUString; using rtl::OString; using rtl::OUStringBuffer; diff --git a/i18npool/source/languagetag/simple-langtag.cxx b/i18npool/source/languagetag/simple-langtag.cxx index 7fd735e..d05ab42 100644 --- a/i18npool/source/languagetag/simple-langtag.cxx +++ b/i18npool/source/languagetag/simple-langtag.cxx @@ -397,6 +397,7 @@ static void lt_tag_dump(const lt_tag_t *tag) fprintf( stderr, "SimpleLangtag region: %s\n", tag->maRegion.mpStr); } #endif + } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/languagetag/languagetag.cxx| 129
i18npool/source/languagetag/simple-langtag.cxx | 401 +
2 files changed, 408 insertions(+), 122 deletions(-)
New commits:
commit 1150a1a8eb1759160b9d88e99d95e5ad082f40be
Author: Eike Rathke
Date: Thu Aug 9 16:06:41 2012 +0200
implemented simple liblangtag replacement for iOS and Android
diff --git a/i18npool/source/languagetag/languagetag.cxx
b/i18npool/source/languagetag/languagetag.cxx
index 728e70a..d7c6b0f 100644
--- a/i18npool/source/languagetag/languagetag.cxx
+++ b/i18npool/source/languagetag/languagetag.cxx
@@ -15,128 +15,13 @@
#if !defined(ANDROID) && !defined(IOS)
#include
-
-#elif defined(ANDROID) || defined(IOS)
-
-// Completely dummy implementation, once this actually starts getting used at
-// run-time will need to do something.
-
-// For iOS probably can use NSLocale, that should have more or less required
-// functionality. If it is good enough, it could be used for Mac OS X,
-// too. For Android, maybe java.util.Locale, although it definitely lacks in
-// functionality.
-
-typedef char gchar;
-typedef struct {
-char *message;
-} GError;
-
-static void g_free(void *p)
-{
-free(p);
-}
-
-static void g_error_free(GError *error)
-{
-(void) error;
-}
-
-typedef void lt_tag_t;
-typedef void lt_lang_t;
-typedef void lt_script_t;
-typedef void lt_region_t;
-
-static void lt_db_initialize(void)
-{
-}
-
-static void lt_db_finalize(void)
-{
-}
-
-static void lt_db_set_datadir(const char *dir)
-{
-(void) dir;
-}
-
-static lt_tag_t *lt_tag_new(void)
-{
-return NULL;
-}
-
-static lt_tag_t *lt_tag_copy(lt_tag_t *tag)
-{
-(void) tag;
-return NULL;
-}
-
-static void lt_tag_unref(lt_tag_t *tag)
-{
-(void) tag;
-}
-
-static int lt_tag_parse(lt_tag_t *tag,
-const char *tag_string,
-GError **error)
-{
-(void) tag;
-(void) tag_string;
-(void) error;
-
-return -1;
-}
-
-static char *lt_tag_canonicalize(lt_tag_t *tag,
- GError **error)
-{
-(void) tag;
-(void) error;
-
-return NULL;
-}
-
-static const lt_lang_t *lt_tag_get_language(const lt_tag_t *tag)
-{
-(void) tag;
-
-return NULL;
-}
-
-static const lt_script_t *lt_tag_get_script(const lt_tag_t *tag)
-{
-(void) tag;
-
-return NULL;
-}
-
-static const lt_region_t *lt_tag_get_region(const lt_tag_t *tag)
-{
-(void) tag;
-
-return NULL;
-}
-
-static const gchar *lt_lang_get_tag(const lt_lang_t *lang)
-{
-(void) lang;
-
-return NULL;
-}
-
-static const gchar *lt_script_get_tag(const lt_script_t *script)
-{
-(void) script;
-
-return NULL;
-}
-
-static const gchar *lt_region_get_tag(const lt_region_t *region)
-{
-(void) region;
-
-return NULL;
-}
-
+#else
+/* Replacement code for LGPL phobic and Android systems.
+ * For iOS we could probably use NSLocale instead, that should have more or
+ * less required functionality. If it is good enough, it could be used for Mac
+ * OS X, too.
+ */
+#include "simple-langtag.cxx"
#endif
//#define erDEBUG
diff --git a/i18npool/source/languagetag/simple-langtag.cxx
b/i18npool/source/languagetag/simple-langtag.cxx
new file mode 100644
index 000..7131749
--- /dev/null
+++ b/i18npool/source/languagetag/simple-langtag.cxx
@@ -0,0 +1,401 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+/** Cheap and cheesy replacement code for liblangtag on systems that do not
+allow / want LGPL code or dependencies on glib.
+
+XXX NOTE: This code does not check language tags for validity or if they
+are registered with IANA, does not canonicalize or strip default script
+tags if included nor does it do any other fancy stuff that liblangtag is
+capable of. It just makes depending code work without.
+ */
+
+#include
+#include
+#include
+
+namespace {
+
+typedef char gchar;
+typedef void* gpointer;
+typedef int gint;
+typedef gint gboolean;
+
+struct GError {
+char *message;
+GError() : message(NULL) {}
+};
+
+static gpointer g_malloc(size_t s)
+{
+return malloc(s);
+}
+
+static void g_free(gpointer p)
+{
+if (p)
+free(p);
+}
+
+static void g_error_free(GError *error)
+{
+if (error)
+{
+g_free( error->message);
+g_free( error);
+}
+}
+
+struct my_ref
+{
+sal_uInt32 mnRef;
+explicit my_ref() : mnRef(1) {}
+virtual ~my_ref() {}
+void incRef() { ++mnRef; }
+void decRef() { if (--mnRef == 0) delete this; }
+};
+
+struct my_t_impl : public my_ref
+{
+gchar* mpStr;
+explicit my_t_impl() : my_ref(), mpStr(NULL) {}
+virtual ~my_t_impl() { g_free( mpStr); }
+
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/list-dateacceptancepattern.awk | 151
++
1 file changed, 102 insertions(+), 49 deletions(-)
New commits:
commit 425e18c231f4f030b278050809ea1fa1f51d4bf2
Author: Eike Rathke
Date: Wed Jul 25 14:46:43 2012 +0200
display bequeath indicator and date separator and format code
diff --git a/i18npool/source/localedata/data/list-dateacceptancepattern.awk
b/i18npool/source/localedata/data/list-dateacceptancepattern.awk
index 1d47814..75f5db1 100644
--- a/i18npool/source/localedata/data/list-dateacceptancepattern.awk
+++ b/i18npool/source/localedata/data/list-dateacceptancepattern.awk
@@ -7,12 +7,13 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# Usage: gawk -f list-dateacceptancepattern.awk *.xml [--html]
+# Usage: gawk -f list-dateacceptancepattern.awk *.xml [--sep [--html]]
#
# Outputs three lists of locales, one with DateAcceptancePattern elements
# defined, one with inherited LC_FORMAT elements and thus date patterns, and
# one where no DateAcceptancePattern are defined.
#
+# If --sep is given, display date separator for each locale.
# If --html is given as the last parameter, format output suitable for
# inclusion in HTML.
@@ -22,18 +23,19 @@ BEGIN {
html = 1
--ARGC
}
+sep = 0
+if (ARGV[ARGC-1] == "--sep") {
+sep = 1
+--ARGC
+}
file = ""
offlocale = 0
-offpatterns = 1
+offpatterncount = 1
offinherit = 2
-inheritedcount = 0
-if (html)
-print ""
-else
-print ""
-print "Locales with explicit DateAcceptancePattern elements:"
-if (html)
-print ""
+offbequeath = 3
+offdatesep = 4
+offdateformat = 5
+offpatterns = 6
}
@@ -41,13 +43,16 @@ file != FILENAME {
if (file)
endFile()
file = FILENAME
-patterns = 0
+patterncount = 0
inherited = ""
+formatelement = 0
+datesep = ""
+dateformat = ""
}
// {
split( $0, a, /<|>/ )
-pattern[patterns++] = a[3]
+patterns[patterncount++] = a[3]
}
# pattern inherited as well
@@ -56,30 +61,77 @@ file != FILENAME {
inherited = a[2]
}
+/]* formatindex="21"[^>]*>/ { formatelement = 1 }
+// {
+if (formatelement)
+{
+formatelement = 0
+split( $0, a, /<|>/ )
+split( a[3], b, /[0-9A-Za-z\[\~\]]+/ )
+datesep = b[2]
+dateformat = a[3]
+}
+}
+
END {
if (file)
endFile()
-PROCINFO["sorted_in"] = "@ind_str_asc"
-
fillAllInherited()
+PROCINFO["sorted_in"] = "@ind_str_asc"
+
+if (html)
+print ""
+else
+print ""
+printLine( "Trailing + indicates that another locale inherits from this." )
+if (sep)
+printLine( "Appended is the locale's date separator and edit format
code." )
+printLine("")
+printLine( "Locales with explicit DateAcceptancePattern elements:" )
if (html)
{
+print ""
+for (i in LocaleList)
+{
+if (LocaleList[i][offpatterns][0])
+{
+print " " getInheritance( LocaleList[i][offlocale],
LocaleList[i][offlocale])
+print " "
+for (p = 0; p < LocaleList[i][offpatterncount]; ++p)
+{
+print " " LocaleList[i][offpatterns][p]
+}
+print " "
+}
+}
print ""
print "\n"
}
else
+{
+for (i in LocaleList)
+{
+if (LocaleList[i][offpatterns][0])
+{
+print getInheritance( LocaleList[i][offlocale],
LocaleList[i][offlocale])
+for (p = 0; p < LocaleList[i][offpatterncount]; ++p)
+{
+print "" LocaleList[i][offpatterns][p]
+}
+}
+}
print "\n"
+}
-print "Locales inheriting patterns:"
+printLine( "Locales inheriting patterns:" )
if (html)
{
-print ""
for (i in LocaleList)
{
-if (LocaleList[i][offinherit] && LocaleList[i][offpatterns])
+if (LocaleList[i][offinherit] && LocaleList[i][offpatterncount])
print getInheritance( LocaleList[i][offlocale],
LocaleList[i][offlocale]) " "
}
print "\n"
@@ -88,23 +140,20 @@ END {
{
for (i in LocaleList)
{
-if (LocaleList[i][offinherit] && LocaleList[i][offpatterns])
+if (LocaleList[i][offinherit] && LocaleList[i][offpatterncount])
print getInheritance( LocaleList[i][offlocale],
LocaleList[i][offlocale])
}
print "\n"
}
-print "Locales without explicit DateAcceptancePattern elements:"
-if (html)
-print ""
-print "(one implicit full date pattern is always generated)"
-if (html)
-pri
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/list-dateacceptancepattern.awk | 17
+++---
1 file changed, 12 insertions(+), 5 deletions(-)
New commits:
commit 369c76f325bf3d998bab0b069a5a4e6112e2d32e
Author: Eike Rathke
Date: Sat Jul 21 01:47:39 2012 +0200
print full inheritance
Change-Id: Ia53fcbde6b3ff4d38b477069a1f956c9aef84f78
diff --git a/i18npool/source/localedata/data/list-dateacceptancepattern.awk
b/i18npool/source/localedata/data/list-dateacceptancepattern.awk
index b272905..1d47814 100644
--- a/i18npool/source/localedata/data/list-dateacceptancepattern.awk
+++ b/i18npool/source/localedata/data/list-dateacceptancepattern.awk
@@ -80,7 +80,7 @@ END {
for (i in LocaleList)
{
if (LocaleList[i][offinherit] && LocaleList[i][offpatterns])
-print LocaleList[i][offlocale] " = " LocaleList[i][offinherit]
" "
+print getInheritance( LocaleList[i][offlocale],
LocaleList[i][offlocale]) " "
}
print "\n"
}
@@ -89,7 +89,7 @@ END {
for (i in LocaleList)
{
if (LocaleList[i][offinherit] && LocaleList[i][offpatterns])
-print LocaleList[i][offlocale] " = " LocaleList[i][offinherit]
+print getInheritance( LocaleList[i][offlocale],
LocaleList[i][offlocale])
}
print "\n"
}
@@ -105,7 +105,7 @@ END {
for (i in LocaleList)
{
if (!LocaleList[i][offpatterns])
-print LocaleList[i][offlocale] " "
+print getInheritance( LocaleList[i][offlocale],
LocaleList[i][offlocale]) " "
}
}
else
@@ -113,13 +113,13 @@ END {
for (i in LocaleList)
{
if (!LocaleList[i][offpatterns])
-print LocaleList[i][offlocale]
+print getInheritance( LocaleList[i][offlocale],
LocaleList[i][offlocale])
}
}
}
-function endFile() {
+function endFile( locale ) {
locale = getLocale( file)
LocaleList[locale][offlocale] = locale
LocaleList[locale][offpatterns] = patterns
@@ -172,4 +172,11 @@ function fillAllInherited( i ) {
}
}
+
+function getInheritance( str, locale ) {
+if (LocaleList[locale][offinherit])
+str = getInheritance( str " = " LocaleList[locale][offinherit],
LocaleList[locale][offinherit])
+return str
+}
+
# vim:set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/list-dateacceptancepattern.awk | 60
++
1 file changed, 40 insertions(+), 20 deletions(-)
New commits:
commit 61c1af3336e91144fadeffe1a479e2a0f10cdfd1
Author: Eike Rathke
Date: Sat Jul 21 01:07:54 2012 +0200
make this extensible and do not omit inherited without patterns
Change-Id: I97a554169637740aab4282b303a32f476f294e2f
diff --git a/i18npool/source/localedata/data/list-dateacceptancepattern.awk
b/i18npool/source/localedata/data/list-dateacceptancepattern.awk
index 87ddfdc..b272905 100644
--- a/i18npool/source/localedata/data/list-dateacceptancepattern.awk
+++ b/i18npool/source/localedata/data/list-dateacceptancepattern.awk
@@ -23,7 +23,9 @@ BEGIN {
--ARGC
}
file = ""
-nopatterns = 0
+offlocale = 0
+offpatterns = 1
+offinherit = 2
inheritedcount = 0
if (html)
print ""
@@ -58,6 +60,11 @@ file != FILENAME {
END {
if (file)
endFile()
+
+PROCINFO["sorted_in"] = "@ind_str_asc"
+
+fillAllInherited()
+
if (html)
{
print ""
@@ -70,19 +77,19 @@ END {
if (html)
{
print ""
-for (i=0; i"
}
else
{
-for (i=0; i"
if (html)
{
-for (i=0; ihttp://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/list-dateacceptancepattern.awk | 56
--
1 file changed, 45 insertions(+), 11 deletions(-)
New commits:
commit 38feb1ef3840a7c4aa8b70e4d1570675697a53ae
Author: Eike Rathke
Date: Fri Jul 20 23:19:31 2012 +0200
include locales inheriting patterns
Change-Id: I06f4578f6d681064a8e41e4bef45a7034b7b5a64
diff --git a/i18npool/source/localedata/data/list-dateacceptancepattern.awk
b/i18npool/source/localedata/data/list-dateacceptancepattern.awk
index b1ad115..87ddfdc 100644
--- a/i18npool/source/localedata/data/list-dateacceptancepattern.awk
+++ b/i18npool/source/localedata/data/list-dateacceptancepattern.awk
@@ -8,8 +8,11 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
# Usage: gawk -f list-dateacceptancepattern.awk *.xml [--html]
-# Outputs two lists of locales, one with DateAcceptancePattern elements
-# defined, and one where none are defined.
+#
+# Outputs three lists of locales, one with DateAcceptancePattern elements
+# defined, one with inherited LC_FORMAT elements and thus date patterns, and
+# one where no DateAcceptancePattern are defined.
+#
# If --html is given as the last parameter, format output suitable for
# inclusion in HTML.
@@ -21,6 +24,7 @@ BEGIN {
}
file = ""
nopatterns = 0
+inheritedcount = 0
if (html)
print ""
else
@@ -36,7 +40,7 @@ file != FILENAME {
endFile()
file = FILENAME
patterns = 0
-noFormatCode = 1
+inherited = ""
}
// {
@@ -44,10 +48,10 @@ file != FILENAME {
pattern[patterns++] = a[3]
}
-# No FormatCode element means inherited LC_FORMAT ref=...
-# hence pattern inherited as well.
-// {
-noFormatCode = 0
+# pattern inherited as well
+/]* ref="[^>"]+"[^>]*>/ {
+split( $0, a, /.* ref="|"/ )
+inherited = a[2]
}
@@ -61,6 +65,28 @@ END {
}
else
print "\n"
+
+print "Locales inheriting patterns:"
+if (html)
+{
+print ""
+for (i=0; i"
+}
+else
+{
+for (i=0; i"
@@ -85,11 +111,13 @@ END {
function endFile() {
+locale = getLocale( file)
+LocaleHasPatterns[locale] = patterns
if (patterns)
{
if (html)
{
-print " " getLocale( file) ":"
+print " " locale ":"
print " "
for ( i=0; ihttp://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/de_AT.xml |1 +
i18npool/source/localedata/data/de_CH.xml |1 +
i18npool/source/localedata/data/de_LI.xml |1 +
i18npool/source/localedata/data/de_LU.xml |1 +
4 files changed, 4 insertions(+)
New commits:
commit d0d840c27943f976fd59a673f2de84a10ea475c9
Author: Eike Rathke
Date: Fri Jul 20 17:51:39 2012 +0200
fdo#52240 added abbreviated date acceptance patterns for [de-{AT,CH,LI,LU}]
Change-Id: I589cedcd2db0208b03d1e28babbb493912f20c78
diff --git a/i18npool/source/localedata/data/de_AT.xml
b/i18npool/source/localedata/data/de_AT.xml
index de57ea9..d657cc5 100644
--- a/i18npool/source/localedata/data/de_AT.xml
+++ b/i18npool/source/localedata/data/de_AT.xml
@@ -52,6 +52,7 @@
metric
+D.M.
Standard
diff --git a/i18npool/source/localedata/data/de_CH.xml
b/i18npool/source/localedata/data/de_CH.xml
index 494eb69..245e57b 100644
--- a/i18npool/source/localedata/data/de_CH.xml
+++ b/i18npool/source/localedata/data/de_CH.xml
@@ -55,6 +55,7 @@
metric
+D.M.
Standard
diff --git a/i18npool/source/localedata/data/de_LI.xml
b/i18npool/source/localedata/data/de_LI.xml
index 5be436a..f927431 100644
--- a/i18npool/source/localedata/data/de_LI.xml
+++ b/i18npool/source/localedata/data/de_LI.xml
@@ -52,6 +52,7 @@
metric
+D.M.
Standard
diff --git a/i18npool/source/localedata/data/de_LU.xml
b/i18npool/source/localedata/data/de_LU.xml
index edbb008..78c85bb 100644
--- a/i18npool/source/localedata/data/de_LU.xml
+++ b/i18npool/source/localedata/data/de_LU.xml
@@ -52,6 +52,7 @@
metric
+D.M.
Standard
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/breakiterator/breakiterator_ctl.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 441b28d4e9d0345f91fed6a2345d4d6a7c7eb5f7 Author: Christophe Jaillet Date: Thu Jun 14 11:34:26 2012 +0100 remove un-necessary memset diff --git a/i18npool/source/breakiterator/breakiterator_ctl.cxx b/i18npool/source/breakiterator/breakiterator_ctl.cxx index 70a3124..5d1d7a1 100644 --- a/i18npool/source/breakiterator/breakiterator_ctl.cxx +++ b/i18npool/source/breakiterator/breakiterator_ctl.cxx @@ -51,7 +51,6 @@ BreakIterator_CTL::BreakIterator_CTL() : // to improve performance, alloc big enough memory in construct. nextCellIndex = (sal_Int32*) calloc(cellIndexSize, sizeof(sal_Int32)); previousCellIndex = (sal_Int32*) calloc(cellIndexSize, sizeof(sal_Int32)); -memset(nextCellIndex, 0, cellIndexSize * sizeof(sal_Int32)); } /** ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/textconversion/textconversion.cxx |4 ++--
i18npool/source/transliteration/textToPronounce_zh.cxx |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 43c0c12369f379ec1c851486883a855f8f445d70
Author: Norbert Thiebaud
Date: Thu May 31 21:19:42 2012 -0500
targeted string re-work
Change-Id: Ie250e1953c84caea5e67c26c7a4f9a1ae206f42b
diff --git a/i18npool/source/textconversion/textconversion.cxx
b/i18npool/source/textconversion/textconversion.cxx
index 30b7fef..39c5ce4 100644
--- a/i18npool/source/textconversion/textconversion.cxx
+++ b/i18npool/source/textconversion/textconversion.cxx
@@ -46,9 +46,9 @@ TextConversion::TextConversion()
{
#ifndef DISABLE_DYNLOADING
#ifdef SAL_DLLPREFIX
-OUString lib(RTL_CONSTASCII_USTRINGPARAM(SAL_DLLPREFIX"textconv_dict"
SAL_DLLEXTENSION));
+OUString lib(SAL_DLLPREFIX"textconv_dict" SAL_DLLEXTENSION);
#else
-OUString lib(RTL_CONSTASCII_USTRINGPARAM("textconv_dict"
SAL_DLLEXTENSION));
+OUString lib("textconv_dict" SAL_DLLEXTENSION);
#endif
hModule = osl_loadModuleRelative(
&thisModule, lib.pData, SAL_LOADMODULE_DEFAULT );
diff --git a/i18npool/source/transliteration/textToPronounce_zh.cxx
b/i18npool/source/transliteration/textToPronounce_zh.cxx
index 7e94b07..3cf3f45 100644
--- a/i18npool/source/transliteration/textToPronounce_zh.cxx
+++ b/i18npool/source/transliteration/textToPronounce_zh.cxx
@@ -172,9 +172,9 @@ extern "C" { static void SAL_CALL thisModule() {} }
TextToPronounce_zh::TextToPronounce_zh(const sal_Char* func_name)
{
#ifdef SAL_DLLPREFIX
-OUString lib(RTL_CONSTASCII_USTRINGPARAM(SAL_DLLPREFIX"index_data"
SAL_DLLEXTENSION));
+OUString lib(SAL_DLLPREFIX"index_data" SAL_DLLEXTENSION);
#else
-OUString lib(RTL_CONSTASCII_USTRINGPARAM("index_data" SAL_DLLEXTENSION));
+OUString lib("index_data" SAL_DLLEXTENSION);
#endif
hModule = osl_loadModuleRelative(
&thisModule, lib.pData, SAL_LOADMODULE_DEFAULT );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/isolang/mslangid.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 8979193090f085d5d171a6daa6f8fa4a188b3130
Author: LuboÅ¡ LuÅák
Date: Tue May 29 16:24:14 2012 +0200
Revert "fdo#45830: Indicate correct default locale setting"
This causes a failure in sc_subsequent_filters_test , the test
fails in non-English locales.
This reverts commit 1a5aae96bdb20e36a17d77ec60da874037544628.
diff --git a/i18npool/source/isolang/mslangid.cxx
b/i18npool/source/isolang/mslangid.cxx
index 8fe16c0..3cd877e 100644
--- a/i18npool/source/isolang/mslangid.cxx
+++ b/i18npool/source/isolang/mslangid.cxx
@@ -94,7 +94,10 @@ LanguageType MsLangId::getRealLanguage( LanguageType nLang )
switch (simplifySystemLanguages( nLang))
{
case LANGUAGE_SYSTEM :
-nLang = getSystemLanguage();
+if (nConfiguredSystemLanguage == LANGUAGE_SYSTEM)
+nLang = getSystemLanguage();
+else
+nLang = nConfiguredSystemLanguage;
break;
case LANGUAGE_NONE :
if (nConfiguredSystemUILanguage == LANGUAGE_SYSTEM)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/en_GB.xml |2 ++ 1 file changed, 2 insertions(+) New commits: commit 495943c872a6ba529505c22924b95f0c7a994e3e Author: Eike Rathke Date: Tue May 29 14:10:10 2012 +0200 added same date acceptance patterns as in gd-GB Change-Id: I2e36fce85882566d19cb3e3c9fa3e037d322ce6c diff --git a/i18npool/source/localedata/data/en_GB.xml b/i18npool/source/localedata/data/en_GB.xml index 0771e36..e2f0a51 100644 --- a/i18npool/source/localedata/data/en_GB.xml +++ b/i18npool/source/localedata/data/en_GB.xml @@ -35,6 +35,8 @@ Metric +D/M +D-M DD/MM/YY ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/isolang/mslangid.cxx |5 +
1 file changed, 1 insertion(+), 4 deletions(-)
New commits:
commit 1a5aae96bdb20e36a17d77ec60da874037544628
Author: Rob Snelders
Date: Sun May 27 12:05:56 2012 +0200
fdo#45830: Indicate correct default locale setting
Change-Id: I73904225b2ea1c5b78453caafe382860fb9a3a0f
diff --git a/i18npool/source/isolang/mslangid.cxx
b/i18npool/source/isolang/mslangid.cxx
index 3cd877e..8fe16c0 100644
--- a/i18npool/source/isolang/mslangid.cxx
+++ b/i18npool/source/isolang/mslangid.cxx
@@ -94,10 +94,7 @@ LanguageType MsLangId::getRealLanguage( LanguageType nLang )
switch (simplifySystemLanguages( nLang))
{
case LANGUAGE_SYSTEM :
-if (nConfiguredSystemLanguage == LANGUAGE_SYSTEM)
-nLang = getSystemLanguage();
-else
-nLang = nConfiguredSystemLanguage;
+nLang = getSystemLanguage();
break;
case LANGUAGE_NONE :
if (nConfiguredSystemUILanguage == LANGUAGE_SYSTEM)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/zh_TW.xml |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 4a3e7dfb0d573cf97555822e11f816dc400b67e4 Author: Eike Rathke Date: Thu May 24 13:22:19 2012 +0200 added missing closing quotes at end of literals Change-Id: I3d204aa54dd9c13dfb87e702fa07aa4234977a49 diff --git a/i18npool/source/localedata/data/zh_TW.xml b/i18npool/source/localedata/data/zh_TW.xml index c683372..a978450 100644 --- a/i18npool/source/localedata/data/zh_TW.xml +++ b/i18npool/source/localedata/data/zh_TW.xml @@ -268,13 +268,13 @@ "å¹´"M"æ"D"æ¥" HH"æ"MM"å"SS"ç§" - EE"å¹´"M"æ"D"æ¥" HH"æ"MM"å + EE"å¹´"M"æ"D"æ¥" HH"æ"MM"å" - GGEE"å¹´"M"æ"D"æ¥" HH"æ"MM"å + GGEE"å¹´"M"æ"D"æ¥" HH"æ"MM"å" - GGGEE"å¹´"M"æ"D"æ¥" HH"æ"MM"å + GGGEE"å¹´"M"æ"D"æ¥" HH"æ"MM"å" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/zh_CN.xml |2 +- i18npool/source/localedata/data/zh_HK.xml |2 +- i18npool/source/localedata/data/zh_MO.xml |2 +- i18npool/source/localedata/data/zh_SG.xml |2 +- i18npool/source/localedata/data/zh_TW.xml |2 +- 5 files changed, 5 insertions(+), 5 deletions(-) New commits: commit 63d7671b21d0b271eb0604a8cb09b49bebf58e43 Author: Eike Rathke Date: Tue May 22 19:33:08 2012 +0200 fixed a typo in zh-* currency format code that has been in since 2002 ... diff --git a/i18npool/source/localedata/data/zh_CN.xml b/i18npool/source/localedata/data/zh_CN.xml index 76e1509..0cd4715 100644 --- a/i18npool/source/localedata/data/zh_CN.xml +++ b/i18npool/source/localedata/data/zh_CN.xml @@ -80,7 +80,7 @@ [$ï¿¥-804]#,##0;-[$ï¿¥-804]#,##0 - [$ï¿¥-804]#,##0.00;-[$ï¿¥-804]##0.00 + [$ï¿¥-804]#,##0.00;-[$ï¿¥-804]#,##0.00 [$ï¿¥-804]#,##0;[RED]-[$ï¿¥-804]#,##0 diff --git a/i18npool/source/localedata/data/zh_HK.xml b/i18npool/source/localedata/data/zh_HK.xml index 891e626..505e1c4 100644 --- a/i18npool/source/localedata/data/zh_HK.xml +++ b/i18npool/source/localedata/data/zh_HK.xml @@ -51,7 +51,7 @@ [$HK$-C04]#,##0;-[$HK$-C04]#,##0 - [$HK$-C04]#,##0.00;-[$HK$-C04]##0.00 + [$HK$-C04]#,##0.00;-[$HK$-C04]#,##0.00 [$HK$-C04]#,##0;[RED]-[$HK$-C04]#,##0 diff --git a/i18npool/source/localedata/data/zh_MO.xml b/i18npool/source/localedata/data/zh_MO.xml index 241147e..a362aa2 100644 --- a/i18npool/source/localedata/data/zh_MO.xml +++ b/i18npool/source/localedata/data/zh_MO.xml @@ -51,7 +51,7 @@ [$MOP$-1404]#,##0;-[$MOP$-1404]#,##0 - [$MOP$-1404]#,##0.00;-[$MOP$-1404]##0.00 + [$MOP$-1404]#,##0.00;-[$MOP$-1404]#,##0.00 [$MOP$-1404]#,##0;[RED]-[$MOP$-1404]#,##0 diff --git a/i18npool/source/localedata/data/zh_SG.xml b/i18npool/source/localedata/data/zh_SG.xml index 49a579f..ebbb812 100644 --- a/i18npool/source/localedata/data/zh_SG.xml +++ b/i18npool/source/localedata/data/zh_SG.xml @@ -51,7 +51,7 @@ [$S$-1004]#,##0;-[$S$-1004]#,##0 - [$S$-1004]#,##0.00;-[$S$-1004]##0.00 + [$S$-1004]#,##0.00;-[$S$-1004]#,##0.00 [$S$-1004]#,##0;[RED]-[$S$-1004]#,##0 diff --git a/i18npool/source/localedata/data/zh_TW.xml b/i18npool/source/localedata/data/zh_TW.xml index 9658e44..c683372 100644 --- a/i18npool/source/localedata/data/zh_TW.xml +++ b/i18npool/source/localedata/data/zh_TW.xml @@ -78,7 +78,7 @@ [$NT$-404]#,##0;-[$NT$-404]#,##0 - [$NT$-404]#,##0.00;-[$NT$-404]##0.00 + [$NT$-404]#,##0.00;-[$NT$-404]#,##0.00 [$NT$-404]#,##0;[RED]-[$NT$-404]#,##0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/zh_TW.xml | 261 +-
1 file changed, 220 insertions(+), 41 deletions(-)
New commits:
commit b676fa6df5ba3ed08c685184f6843aeaffa3d94f
Author: Cheng-Chia Tseng
Date: Tue May 22 18:57:43 2012 +0200
updated [zh-TW] locale data fdo#49274
diff --git a/i18npool/source/localedata/data/zh_TW.xml
b/i18npool/source/localedata/data/zh_TW.xml
index bd8c0c6..9658e44 100644
--- a/i18npool/source/localedata/data/zh_TW.xml
+++ b/i18npool/source/localedata/data/zh_TW.xml
@@ -35,11 +35,11 @@
metric
-Y.M.D
+MæDæ¥
M-D
M/D
Yå¹´MæDæ¥
-MæDæ¥
+Y.M.D
General
@@ -94,69 +94,126 @@
- YY/M/D
+ /M/D
- "å¹´"M"æ"D"æ¥"
+ "å¹´"M"æ"D"æ¥"
- E/M/D
+ EE/MM/DD
- /M/D
+ /MM/DD
- YY"å¹´"M"æ"D"æ¥"
+ EE"å¹´"MMMD"æ¥"
- "å¹´"M"æ"D"æ¥"
+ "å¹´"MMMD"æ¥"
- GGEE"å¹´"M"æ"D"æ¥"
+ "å¹´"MMMD"è"
- GGGEE"å¹´"M"æ"D"æ¥"
+ [NatNum1]"å¹´"D"æ¥"
- D.
+ [NatNum1]"å¹´"D"è"
- YY"å¹´"M"æ"D"æ¥"
+ EE"å¹´"MMMD"æ¥ ("DDD")"
- YY/M/D
+ EE"å¹´"MMMDD"æ¥ ("DDD")"
- GGEE"å¹´"M"æ"D"æ¥"
+ [NatNum1]"å¹´"D"æ¥ ("DDD")"
- GGGEE"å¹´"M"æ"D"æ¥"
+ [NatNum1]"å¹´"D"æ¥"
- M"æ"D"æ¥"
+ MM-DD
- EE"å¹´"M"æ"D"æ¥"
+ YY-MM-DD
-MM-DD
ISO 8601
- YY/M
+ EE"å¹´"MM"æ"
- D"æ¥"
+ MMMDD"æ¥"
- GGEE"年度"QQ
+ "å¹´"QQ
"第"WW"é±"
+
+ E/M/D
+
+
+ GGEE"å¹´"M"æ"D"æ¥"
+
+
+ [NatNum1]GGEE"å¹´"M"æ"D"æ¥"
+
+
+ GGGEE"å¹´"M"æ"D"æ¥"
+
+
+ [NatNum1]GGGEE"å¹´"M"æ"D"æ¥"
+
+
+ GGEE"å¹´"M"æ"D"æ¥ ("DDD")"
+
+
+ GGGEE"å¹´"M"æ"D"æ¥ ("DDD")"
+
+
+ "å¹´"M"æ"D"æ¥ ("DDD")"
+
+
+ "å¹´"M"æ"D"æ¥ "
+
+
+ GGEE"å¹´"M"æ"D"æ¥ "
+
+
+ [NatNum1]GGEE"å¹´"M"æ"D"æ¥ "
+
+
+ GGGEE"å¹´"M"æ"D"æ¥ "
+
+
+ [NatNum1]GGGEE"å¹´"M"æ"D"æ¥ "
+
+
+ [NatNum1]EE"å¹´"M"æ"
+
+
+ [NatNum1]GGEE"å¹´"M"æ"
+
+
+ [NatNum1]GGGEE"å¹´"M"æ"
+
+
+ "å¹´"MM"æ"
+
+
+ [NatNum1]"å¹´"MM"æ"
+
+
+ M"."D
+
HH:MM
@@ -179,45 +236,45 @@
[HH]:MM:SS.00
-
+
HH"æ"MM"å"
-
+
HH"æ"MM"å"SS"ç§"
-
+
AM/PM HH"æ"MM"å"
-
+
AM/PM HH"æ"MM"å"SS"ç§"
-
+
[HH] "æ"MM"å"SS"ç§"
-
+
MM"å"SS"ç§"00
- M/D/YY HH:MM
+ /M/D HH:MM
- MM/DD/ HH:MM:SS
+ /MM/DD HH:MM:SS
-
- EE"å¹´"M"æ"D"æ¥" HH"æ"MM"å"SS"ç§"
+
+ "å¹´"M"æ"D"æ¥" HH"æ"MM"å"
-
- YY"å¹´"M"æ"D"æ¥" HH"æ"MM"å"SS"ç§"
+
+ "å¹´"M"æ"D"æ¥" HH"æ"MM"å"SS"ç§"
-
- GGEE"å¹´"M"æ"D"æ¥" HH"æ"MM"å"SS"ç§"
+
+ EE"å¹´"M"æ"D"æ¥" HH"æ"MM"å
-
- GGGEE"å¹´"M"æ"D"æ¥" HH"æ"MM"å"SS"ç§"
+
+ GGEE"å¹´"M"æ"D"æ¥" HH"æ"MM"å
-
- "å¹´"M"æ"D"æ¥" HH"æ"MM"å"SS"ç§"
+
+ GGGEE"å¹´"M"æ"D"æ¥" HH"æ"MM"å
@@ -242,7 +299,68 @@
-
+
+
+ jan
+ 1æ
+ ä¸æ
+
+
+ feb
+ 2æ
+ äºæ
+
+
+ mar
+ 3æ
+ ä¸æ
+
+
+ apr
+ 4æ
+ åæ
+
+
+ may
+ 5æ
+ äºæ
+
+
+ jun
+ 6æ
+ å
æ
+
+
+ jul
+ 7æ
+ ä¸æ
+
+
+ aug
+ 8æ
+ å
«æ
+
+
+ sep
+ 9æ
+ ä¹æ
+
+
+ oct
+ 10æ
+ åæ
+
+
+ nov
+ 11æ
+ åä¸æ
+
+
+ dec
+ 12æ
+ åäºæ
+
+
bc
@@ -262,7 +380,68 @@
-
+
+
+ jan
+ 1æ
+ ä¸æ
+
+
+ feb
+ 2æ
+ äºæ
+
+
+ mar
+ 3æ
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/br_FR.xml |2 ++ i18npool/source/localedata/data/fr_FR.xml |2 ++ i18npool/source/localedata/data/gsc_FR.xml |3 +++ i18npool/source/localedata/data/oc_FR.xml |3 +++ 4 files changed, 10 insertions(+) New commits: commit b936d537e4cf4d146afaa5d5aec665a2b5be3735 Author: Eike Rathke Date: Tue May 15 19:17:49 2012 +0200 added common date acceptance patterns to *-FR locales diff --git a/i18npool/source/localedata/data/br_FR.xml b/i18npool/source/localedata/data/br_FR.xml index b6098f4..f9ec007 100644 --- a/i18npool/source/localedata/data/br_FR.xml +++ b/i18npool/source/localedata/data/br_FR.xml @@ -36,6 +36,8 @@ D/M +D.M.Y +D-M-Y Skoueriek diff --git a/i18npool/source/localedata/data/fr_FR.xml b/i18npool/source/localedata/data/fr_FR.xml index 1e2bbea..20995e4 100644 --- a/i18npool/source/localedata/data/fr_FR.xml +++ b/i18npool/source/localedata/data/fr_FR.xml @@ -36,6 +36,8 @@ D/M +D.M.Y +D-M-Y Standard diff --git a/i18npool/source/localedata/data/gsc_FR.xml b/i18npool/source/localedata/data/gsc_FR.xml index 3ee512f..2f37bac 100644 --- a/i18npool/source/localedata/data/gsc_FR.xml +++ b/i18npool/source/localedata/data/gsc_FR.xml @@ -35,6 +35,9 @@ metric +D/M +D.M.Y +D-M-Y General diff --git a/i18npool/source/localedata/data/oc_FR.xml b/i18npool/source/localedata/data/oc_FR.xml index d0eb28b..e05ca8b 100644 --- a/i18npool/source/localedata/data/oc_FR.xml +++ b/i18npool/source/localedata/data/oc_FR.xml @@ -35,6 +35,9 @@ metric +D/M +D.M.Y +D-M-Y General ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/sv_SE.xml |2 ++ 1 file changed, 2 insertions(+) New commits: commit 208617ab0441f4b985656fcdb26516034db5327b Author: Eike Rathke Date: Fri May 11 11:24:02 2012 +0200 added Swedish [sv-SE] date acceptance patterns 'D/M' and 'D/M Y' http://erack.org/blog/archives/18-Does-your-LibreOffice-locale-need-a-date-acceptance-pattern-for-incomplete-date-input.html#c245 http://www.spraknamnden.se/sprakladan/ShowSearch.aspx?id=id=26089;objekttyp=lan diff --git a/i18npool/source/localedata/data/sv_SE.xml b/i18npool/source/localedata/data/sv_SE.xml index a017484..244472a 100644 --- a/i18npool/source/localedata/data/sv_SE.xml +++ b/i18npool/source/localedata/data/sv_SE.xml @@ -35,6 +35,8 @@ metric +D/M +D/M Y Standard ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/is_IS.xml |1 + 1 file changed, 1 insertion(+) New commits: commit 2caba57e77d1cfaf2ab08473334fcaa45d4a296b Author: Eike Rathke Date: Wed May 2 16:29:37 2012 +0200 re-added 'D/M/' date acceptance pattern to [is-IS] Argument is that "the reason for the "D/M/" pattern is for those who use the numpad for input", well, makes sense. diff --git a/i18npool/source/localedata/data/is_IS.xml b/i18npool/source/localedata/data/is_IS.xml index 8ba0d9d..44c97f4 100644 --- a/i18npool/source/localedata/data/is_IS.xml +++ b/i18npool/source/localedata/data/is_IS.xml @@ -38,6 +38,7 @@ D.M. D. M. D. M. Y +D/M/ Standard ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/list-dateacceptancepattern.awk | 121
++
1 file changed, 121 insertions(+)
New commits:
commit 17e6c9b8bf482bc36436c4d8daca994a65ce4634
Author: Eike Rathke
Date: Mon Apr 30 21:27:05 2012 +0200
script to list locales with and without DateAcceptancePattern
diff --git a/i18npool/source/localedata/data/list-dateacceptancepattern.awk
b/i18npool/source/localedata/data/list-dateacceptancepattern.awk
new file mode 100644
index 000..b1ad115
--- /dev/null
+++ b/i18npool/source/localedata/data/list-dateacceptancepattern.awk
@@ -0,0 +1,121 @@
+#!/usr/bin/gawk -f
+# -*- Mode: awk; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+#
+# Copyright 2012 LibreOffice contributors.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Usage: gawk -f list-dateacceptancepattern.awk *.xml [--html]
+# Outputs two lists of locales, one with DateAcceptancePattern elements
+# defined, and one where none are defined.
+# If --html is given as the last parameter, format output suitable for
+# inclusion in HTML.
+
+BEGIN {
+html = 0
+if (ARGV[ARGC-1] == "--html") {
+html = 1
+--ARGC
+}
+file = ""
+nopatterns = 0
+if (html)
+print ""
+else
+print ""
+print "Locales with explicit DateAcceptancePattern elements:"
+if (html)
+print ""
+}
+
+
+file != FILENAME {
+if (file)
+endFile()
+file = FILENAME
+patterns = 0
+noFormatCode = 1
+}
+
+// {
+split( $0, a, /<|>/ )
+pattern[patterns++] = a[3]
+}
+
+# No FormatCode element means inherited LC_FORMAT ref=...
+# hence pattern inherited as well.
+// {
+noFormatCode = 0
+}
+
+
+END {
+if (file)
+endFile()
+if (html)
+{
+print ""
+print "\n"
+}
+else
+print "\n"
+print "Locales without explicit DateAcceptancePattern elements:"
+if (html)
+print ""
+print "(one implicit full date pattern is always generated)"
+if (html)
+print ""
+if (html)
+{
+for (i=0; i " getLocale( file) ":"
+print " "
+for ( i=0; i " pattern[i]
+}
+print " "
+}
+else
+{
+print getLocale( file) ":"
+for ( i=0; ihttp://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/LocaleNode.cxx | 21 +
1 file changed, 13 insertions(+), 8 deletions(-)
New commits:
commit 6ac33c3c123bba66b8a63707ad13a53382e4ad69
Author: Eike Rathke
Date: Mon Apr 30 15:12:06 2012 +0200
be more specific in locale data date acceptance pattern check output
diff --git a/i18npool/source/localedata/LocaleNode.cxx
b/i18npool/source/localedata/LocaleNode.cxx
index cd021e9..af8e936 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -1178,13 +1178,16 @@ void LCFormatNode::generateCode (const OFileWriter &of)
const
if (((nDetected & 7) != 7) || aPattern.getLength() < 5)
{
incErrorStr( "failed to extract full date acceptance pattern",
aPattern);
-fprintf( stderr, " with DateSeparator '%s' from FormatCode
'%s'\n",
-OSTR( OUString( cDateSep)), OSTR( sTheDateEditFormat));
+fprintf( stderr, " with DateSeparator '%s' from FormatCode
'%s' (formatindex=\"%d\")\n",
+OSTR( OUString( cDateSep)), OSTR( sTheDateEditFormat),
+(int)cssi::NumberFormatIndex::DATE_SYS_DDMM);
}
else
{
-fprintf( stderr, "Generated date acceptance pattern: '%s' from
'%s'\n",
-OSTR( aPattern), OSTR( sTheDateEditFormat));
+fprintf( stderr, "Generated date acceptance pattern: '%s' from
'%s' (formatindex=\"%d\" and defined DateSeparator '%s')\n",
+OSTR( aPattern), OSTR( sTheDateEditFormat),
+(int)cssi::NumberFormatIndex::DATE_SYS_DDMM,
+OSTR( OUString( cDateSep)));
// Insert at front so full date pattern is first in checks.
theDateAcceptancePatterns.insert(
theDateAcceptancePatterns.begin(), aPattern);
}
@@ -1194,13 +1197,15 @@ void LCFormatNode::generateCode (const OFileWriter &of)
const
if (aPattern2.getLength() < 5)
{
incErrorStr( "failed to extract 2nd date acceptance pattern",
aPattern2);
-fprintf( stderr, " with DateSeparator '%s' from
FormatCode '%s'\n",
-OSTR( OUString( cDateSep2)), OSTR(
sTheDateEditFormat));
+fprintf( stderr, " with DateSeparator '%s' from
FormatCode '%s' (formatindex=\"%d\")\n",
+OSTR( OUString( cDateSep2)), OSTR( sTheDateEditFormat),
+(int)cssi::NumberFormatIndex::DATE_SYS_DDMM);
}
else
{
-fprintf( stderr, "Generated 2nd acceptance pattern: '%s' from
'%s'\n",
-OSTR( aPattern2), OSTR( sTheDateEditFormat));
+fprintf( stderr, "Generated 2nd acceptance pattern: '%s' from
'%s' (formatindex=\"%d\")\n",
+OSTR( aPattern2), OSTR( sTheDateEditFormat),
+(int)cssi::NumberFormatIndex::DATE_SYS_DDMM);
theDateAcceptancePatterns.insert(
theDateAcceptancePatterns.begin(), aPattern2);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
