From db754e891e35a2832645fce676a5f6f0bf162976 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sun, 24 Mar 2013 17:36:31 -0400 Subject: fix breakiterator with Library_merged Change-Id: I78327067b977b522d34cc734c83c252e22d208b6 --- i18npool/source/localedata/localedata.cxx | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'i18npool/source') 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; -- cgit