diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-24 17:36:31 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-03-24 18:25:04 -0400 |
| commit | db754e891e35a2832645fce676a5f6f0bf162976 (patch) | |
| tree | 2768dc3e906a88d0cddbbbc83b95a4335fce57c4 /i18npool/source | |
| parent | c17eaa63273a7544ea812990d7e0e5644385a220 (diff) | |
fix breakiterator with Library_merged
Change-Id: I78327067b977b522d34cc734c83c252e22d208b6
Diffstat (limited to 'i18npool/source')
| -rw-r--r-- | i18npool/source/localedata/localedata.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index 5880d115a2ea..ae2033570b33 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -43,6 +43,15 @@ typedef sal_Unicode const * const * (SAL_CALL * MyFunc_FormatCode)( sal_Int16&, #ifndef DISABLE_DYNLOADING +#ifdef LIBO_MERGELIBS + +static const char *lcl_DATA_EN = "mergedlo"; +static const char *lcl_DATA_ES = "mergedlo"; +static const char *lcl_DATA_EURO = "mergedlo"; +static const char *lcl_DATA_OTHERS = "mergedlo"; + +#else + static const char *lcl_DATA_EN = "localedata_en"; static const char *lcl_DATA_ES = "localedata_es"; static const char *lcl_DATA_EURO = "localedata_euro"; @@ -50,8 +59,6 @@ static const char *lcl_DATA_OTHERS = "localedata_others"; #endif -#ifndef DISABLE_DYNLOADING - static const struct { const char* pLocale; const char* pLib; |