Kaydet (Commit) 3609fc4b authored tarafından Matúš Kukan's avatar Matúš Kukan

Revert "fix breakiterator with Library_merged"

This reverts commit db754e89.
üst 76fa6219
...@@ -41,15 +41,6 @@ typedef sal_Unicode const * const * (SAL_CALL * MyFunc_FormatCode)( sal_Int16&, ...@@ -41,15 +41,6 @@ typedef sal_Unicode const * const * (SAL_CALL * MyFunc_FormatCode)( sal_Int16&,
#ifndef DISABLE_DYNLOADING #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_EN = "localedata_en";
static const char *lcl_DATA_ES = "localedata_es"; static const char *lcl_DATA_ES = "localedata_es";
static const char *lcl_DATA_EURO = "localedata_euro"; static const char *lcl_DATA_EURO = "localedata_euro";
...@@ -57,6 +48,8 @@ static const char *lcl_DATA_OTHERS = "localedata_others"; ...@@ -57,6 +48,8 @@ static const char *lcl_DATA_OTHERS = "localedata_others";
#endif #endif
#ifndef DISABLE_DYNLOADING
static const struct { static const struct {
const char* pLocale; const char* pLocale;
const char* pLib; const char* pLib;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment