diff options
Diffstat (limited to 'i18npool')
| -rw-r--r-- | i18npool/source/localedata/localedata.cxx | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index 7960f5061a69..2e50fe81b2f4 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -41,15 +41,6 @@ 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"; @@ -57,6 +48,8 @@ static const char *lcl_DATA_OTHERS = "localedata_others"; #endif +#ifndef DISABLE_DYNLOADING + static const struct { const char* pLocale; const char* pLib; |