renamed LocaleData to LocaleDataImpl to prevent confusion

... between com::sun::star::i18n::LocaleData of
com/sun/star/i18n/LocaleData.hpp and i18npool/inc/localedata.hxx

Change-Id: Id23f67c1e3a654fd4f2886029ee45fcc1f466879

i18npool/inc/localedata.hxx

@@ -62,15 +62,15 @@ inline sal_Bool operator ==(const com::sun::star::lang::Locale& l1, const com::s
     return l1.Language == l2.Language && l1.Country == l2.Country && l1.Variant == l2.Variant;
 };
 
-class LocaleData : public cppu::WeakImplHelper2
+class LocaleDataImpl : public cppu::WeakImplHelper2
 <
     com::sun::star::i18n::XLocaleData4,
     com::sun::star::lang::XServiceInfo
 >
 {
 public:
-    LocaleData();
-    ~LocaleData();
+    LocaleDataImpl();
+    ~LocaleDataImpl();
 
     static com::sun::star::uno::Sequence< com::sun::star::i18n::CalendarItem > downcastCalendarItems( const com::sun::star::uno::Sequence< com::sun::star::i18n::CalendarItem2 > & rCi );
     static com::sun::star::i18n::Calendar downcastCalendar( const com::sun::star::i18n::Calendar2 & rC );

i18npool/source/breakiterator/breakiterator_cjk.cxx

@@ -120,7 +120,7 @@ LineBreakResults SAL_CALL BreakIterator_CJK::getLineBreak(
 BreakIterator_zh::BreakIterator_zh()
 {
         dict = new xdictionary("zh");
-        hangingCharacters = LocaleData().getHangingCharacters(LOCALE("zh", "CN"));
+        hangingCharacters = LocaleDataImpl().getHangingCharacters(LOCALE("zh", "CN"));
         cBreakIterator = "com.sun.star.i18n.BreakIterator_zh";
 }
 
@@ -135,7 +135,7 @@ BreakIterator_zh::~BreakIterator_zh()
 BreakIterator_zh_TW::BreakIterator_zh_TW()
 {
         dict = new xdictionary("zh");
-        hangingCharacters = LocaleData().getHangingCharacters(LOCALE("zh", "TW"));
+        hangingCharacters = LocaleDataImpl().getHangingCharacters(LOCALE("zh", "TW"));
         cBreakIterator = "com.sun.star.i18n.BreakIterator_zh_TW";
 }
 
@@ -151,7 +151,7 @@ BreakIterator_ja::BreakIterator_ja()
 {
         dict = new xdictionary("ja");
         dict->setJapaneseWordBreak();
-        hangingCharacters = LocaleData().getHangingCharacters(LOCALE("ja", "JP"));
+        hangingCharacters = LocaleDataImpl().getHangingCharacters(LOCALE("ja", "JP"));
         cBreakIterator = "com.sun.star.i18n.BreakIterator_ja";
 }
 
@@ -165,7 +165,7 @@ BreakIterator_ja::~BreakIterator_ja()
 //      ----------------------------------------------------;
 BreakIterator_ko::BreakIterator_ko()
 {
-        hangingCharacters = LocaleData().getHangingCharacters(LOCALE("ko", "KR"));
+        hangingCharacters = LocaleDataImpl().getHangingCharacters(LOCALE("ko", "KR"));
         cBreakIterator = "com.sun.star.i18n.BreakIterator_ko";
 }
 

i18npool/source/breakiterator/breakiterator_unicode.cxx

@@ -107,7 +107,7 @@ void SAL_CALL BreakIterator_Unicode::loadICUBreakIterator(const com::sun::star::
             icuBI->aBreakIterator=NULL;
         }
         if (rule) {
-            uno::Sequence< OUString > breakRules = LocaleData().getBreakIteratorRules(rLocale);
+            uno::Sequence< OUString > breakRules = LocaleDataImpl().getBreakIteratorRules(rLocale);
 
             status = U_ZERO_ERROR;
             udata_setAppData("OpenOffice", OpenOffice_dat, &status);

i18npool/source/calendar/calendarImpl.cxx

@@ -45,7 +45,7 @@ CalendarImpl::~CalendarImpl()
 void SAL_CALL
 CalendarImpl::loadDefaultCalendar( const Locale& rLocale ) throw(RuntimeException)
 {
-    Sequence< Calendar2 > xC = LocaleData().getAllCalendars2(rLocale);
+    Sequence< Calendar2 > xC = LocaleDataImpl().getAllCalendars2(rLocale);
     for (sal_Int32 i = 0; i < xC.getLength(); i++) {
         if (xC[i].Default) {
             loadCalendar(xC[i].Name, rLocale);
@@ -75,7 +75,7 @@ CalendarImpl::loadCalendar(const OUString& uniqueID, const Locale& rLocale ) thr
 
         if ( ! xI.is() ) {
             // check if the calendar is defined in localedata, load gregorian calendar service.
-            Sequence< Calendar2 > xC = LocaleData().getAllCalendars2(rLocale);
+            Sequence< Calendar2 > xC = LocaleDataImpl().getAllCalendars2(rLocale);
             for (i = 0; i < xC.getLength(); i++) {
                 if (uniqueID == xC[i].Name) {
                     xI = m_xContext->getServiceManager()->createInstanceWithContext("com.sun.star.i18n.Calendar_gregorian", m_xContext);
@@ -130,7 +130,7 @@ CalendarImpl::getLoadedCalendar() throw(RuntimeException)
 Sequence< OUString > SAL_CALL
 CalendarImpl::getAllCalendars( const Locale& rLocale ) throw(RuntimeException)
 {
-    Sequence< Calendar2 > xC = LocaleData().getAllCalendars2(rLocale);
+    Sequence< Calendar2 > xC = LocaleDataImpl().getAllCalendars2(rLocale);
     sal_Int32 nLen = xC.getLength();
     Sequence< OUString > xSeq( nLen );
     for (sal_Int32 i = 0; i < nLen; i++)

i18npool/source/calendar/calendar_gregorian.cxx

@@ -183,8 +183,8 @@ Calendar_hanja::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_Int16
             // Am/Pm string for Korean Hanja calendar will refer to Japanese locale
             com::sun::star::lang::Locale jaLocale =
                 com::sun::star::lang::Locale(OUString("ja"), OUString(), OUString());
-            if (idx == 0) return LocaleData().getLocaleItem(jaLocale).timeAM;
-            else if (idx == 1) return LocaleData().getLocaleItem(jaLocale).timePM;
+            if (idx == 0) return LocaleDataImpl().getLocaleItem(jaLocale).timeAM;
+            else if (idx == 1) return LocaleDataImpl().getLocaleItem(jaLocale).timePM;
             else throw ERROR;
         }
         else
@@ -236,7 +236,7 @@ Calendar_gregorian::loadCalendar( const OUString& uniqueID, const com::sun::star
         getValue();
 
         aLocale = rLocale;
-        Sequence< Calendar2 > xC = LocaleData().getAllCalendars2(rLocale);
+        Sequence< Calendar2 > xC = LocaleDataImpl().getAllCalendars2(rLocale);
         for (sal_Int32 i = 0; i < xC.getLength(); i++)
         {
             if (uniqueID == xC[i].Name)
@@ -271,7 +271,7 @@ Calendar_gregorian::getLoadedCalendar2() throw(RuntimeException)
 com::sun::star::i18n::Calendar SAL_CALL
 Calendar_gregorian::getLoadedCalendar() throw(RuntimeException)
 {
-        return LocaleData::downcastCalendar( aCalendar);
+        return LocaleDataImpl::downcastCalendar( aCalendar);
 }
 
 OUString SAL_CALL
@@ -921,14 +921,14 @@ Calendar_gregorian::getNumberOfDaysInWeek() throw(RuntimeException)
 Sequence< CalendarItem > SAL_CALL
 Calendar_gregorian::getDays() throw(RuntimeException)
 {
-        return LocaleData::downcastCalendarItems( aCalendar.Days);
+        return LocaleDataImpl::downcastCalendarItems( aCalendar.Days);
 }
 
 
 Sequence< CalendarItem > SAL_CALL
 Calendar_gregorian::getMonths() throw(RuntimeException)
 {
-        return LocaleData::downcastCalendarItems( aCalendar.Months);
+        return LocaleDataImpl::downcastCalendarItems( aCalendar.Months);
 }
 
 
@@ -967,8 +967,8 @@ Calendar_gregorian::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_I
 
         switch( displayIndex ) {
             case CalendarDisplayIndex::AM_PM:/* ==0 */
-                if (idx == 0) aStr = LocaleData().getLocaleItem(aLocale).timeAM;
-                else if (idx == 1) aStr = LocaleData().getLocaleItem(aLocale).timePM;
+                if (idx == 0) aStr = LocaleDataImpl().getLocaleItem(aLocale).timeAM;
+                else if (idx == 1) aStr = LocaleDataImpl().getLocaleItem(aLocale).timePM;
                 else throw ERROR;
                 break;
             case CalendarDisplayIndex::DAY:
@@ -1030,7 +1030,7 @@ Calendar_gregorian::getDisplayStringImpl( sal_Int32 nCalendarDisplayCode, sal_In
 
     if (nCalendarDisplayCode == CalendarDisplayCode::SHORT_QUARTER ||
             nCalendarDisplayCode == CalendarDisplayCode::LONG_QUARTER) {
-        Sequence< OUString> xR = LocaleData().getReservedWord(aLocale);
+        Sequence< OUString> xR = LocaleDataImpl().getReservedWord(aLocale);
         sal_Int16 quarter = value / 3;
         // Since this base class method may be called by derived calendar
         // classes where a year consists of more than 12 months we need a check

i18npool/source/characterclassification/characterclassificationImpl.cxx

@@ -170,10 +170,10 @@ CharacterClassificationImpl::getLocaleSpecificCharacterClassification(const Loca
             // Load service with name <base>_<lang>_<country> or
             // <base>_<bcp47> and fallbacks.
             bool bLoaded = createLocaleSpecificCharacterClassification(
-                    LocaleData::getFirstLocaleServiceName( rLocale), rLocale);
+                    LocaleDataImpl::getFirstLocaleServiceName( rLocale), rLocale);
             if (!bLoaded)
             {
-                ::std::vector< OUString > aFallbacks( LocaleData::getFallbackLocaleServiceNames( rLocale));
+                ::std::vector< OUString > aFallbacks( LocaleDataImpl::getFallbackLocaleServiceNames( rLocale));
                 for (::std::vector< OUString >::const_iterator it( aFallbacks.begin()); it != aFallbacks.end(); ++it)
                 {
                     bLoaded = createLocaleSpecificCharacterClassification( *it, rLocale);

i18npool/source/collator/collator_unicode.cxx

@@ -113,7 +113,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
 {
     if (!collator) {
         UErrorCode status = U_ZERO_ERROR;
-        OUString rule = LocaleData().getCollatorRuleByAlgorithm(rLocale, rAlgorithm);
+        OUString rule = LocaleDataImpl().getCollatorRuleByAlgorithm(rLocale, rAlgorithm);
         if (!rule.isEmpty()) {
             collator = new RuleBasedCollator(reinterpret_cast<const UChar *>(rule.getStr()), status);   // UChar != sal_Unicode in MinGW
             if (! U_SUCCESS(status)) throw RuntimeException();

i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx

@@ -279,13 +279,13 @@ void DefaultNumberingProvider::impl_loadTranslit()
 Sequence< Reference<container::XIndexAccess> >
 DefaultNumberingProvider::getDefaultOutlineNumberings(const Locale& rLocale ) throw(RuntimeException)
 {
-     return LocaleData().getOutlineNumberingLevels( rLocale );
+     return LocaleDataImpl().getOutlineNumberingLevels( rLocale );
 }
 
 Sequence< Sequence<beans::PropertyValue> >
 DefaultNumberingProvider::getDefaultContinuousNumberingLevels( const Locale& rLocale ) throw(RuntimeException)
 {
-     return LocaleData().getContinuousNumberingLevels( rLocale );
+     return LocaleDataImpl().getContinuousNumberingLevels( rLocale );
 }
 
 OUString toRoman( sal_Int32 n )

i18npool/source/indexentry/indexentrysupplier.cxx

@@ -35,12 +35,12 @@ IndexEntrySupplier::IndexEntrySupplier( const Reference < XComponentContext >& r
 
 Sequence < Locale > SAL_CALL IndexEntrySupplier::getLocaleList() throw (RuntimeException)
 {
-        return LocaleData().getAllInstalledLocaleNames();
+        return LocaleDataImpl().getAllInstalledLocaleNames();
 }
 
 Sequence < OUString > SAL_CALL IndexEntrySupplier::getAlgorithmList( const Locale& rLocale ) throw (RuntimeException)
 {
-        return LocaleData().getIndexAlgorithm(rLocale);
+        return LocaleDataImpl().getIndexAlgorithm(rLocale);
 }
 
 sal_Bool SAL_CALL IndexEntrySupplier::loadAlgorithm( const Locale& rLocale, const OUString& SortAlgorithm,
@@ -58,7 +58,7 @@ sal_Bool SAL_CALL IndexEntrySupplier::loadAlgorithm( const Locale& rLocale, cons
 
 sal_Bool SAL_CALL IndexEntrySupplier::usePhoneticEntry( const Locale& rLocale ) throw (RuntimeException)
 {
-        return LocaleData().hasPhonetic(rLocale);
+        return LocaleDataImpl().hasPhonetic(rLocale);
 }
 
 OUString SAL_CALL IndexEntrySupplier::getPhoneticCandidate( const OUString& rIndexEntry,
@@ -118,7 +118,7 @@ IndexEntrySupplier::getLocaleSpecificIndexEntrySupplier(const Locale& rLocale, c
                 rLocale.Country == aLocale.Country && rLocale.Variant == aLocale.Variant)
             return xIES;
         else {
-            LocaleData ld;
+            LocaleDataImpl ld;
             aLocale = rLocale;
             if (rSortAlgorithm.isEmpty())
                 aSortAlgorithm = ld.getDefaultIndexAlgorithm( rLocale );
@@ -167,7 +167,7 @@ IndexEntrySupplier::getLocaleSpecificIndexEntrySupplier(const Locale& rLocale, c
 OUString SAL_CALL IndexEntrySupplier::getIndexFollowPageWord( sal_Bool bMorePages,
         const Locale& rLocale ) throw (RuntimeException)
 {
-        Sequence< OUString > aFollowPageWords = LocaleData().getFollowPageWords(rLocale);
+        Sequence< OUString > aFollowPageWords = LocaleDataImpl().getFollowPageWords(rLocale);
 
         return (bMorePages && aFollowPageWords.getLength() > 1) ?
             aFollowPageWords[1] : (aFollowPageWords.getLength() > 0 ?

i18npool/source/indexentry/indexentrysupplier_common.cxx

@@ -64,7 +64,7 @@ sal_Bool SAL_CALL IndexEntrySupplier_Common::usePhoneticEntry( const lang::Local
 sal_Bool SAL_CALL IndexEntrySupplier_Common::loadAlgorithm( const lang::Locale& rLocale,
     const OUString& rAlgorithm, sal_Int32 collatorOptions ) throw (RuntimeException)
 {
-    usePhonetic = LocaleData().isPhonetic(rLocale, rAlgorithm);
+    usePhonetic = LocaleDataImpl().isPhonetic(rLocale, rAlgorithm);
     collator->loadCollatorAlgorithm(rAlgorithm, rLocale, collatorOptions);
     aLocale = rLocale;
     aAlgorithm = rAlgorithm;

i18npool/source/indexentry/indexentrysupplier_default.cxx

@@ -163,11 +163,11 @@ OUString Index::getIndexDescription(const OUString& rIndexEntry)
 
 void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm) throw (RuntimeException)
 {
-    OUString keyStr = LocaleData().getIndexKeysByAlgorithm(rLocale, algorithm);
+    OUString keyStr = LocaleDataImpl().getIndexKeysByAlgorithm(rLocale, algorithm);
 
     if (keyStr.isEmpty()) {
-        keyStr = LocaleData().getIndexKeysByAlgorithm(LOCALE_EN,
-                    LocaleData().getDefaultIndexAlgorithm(LOCALE_EN));
+        keyStr = LocaleDataImpl().getIndexKeysByAlgorithm(LOCALE_EN,
+                    LocaleDataImpl().getDefaultIndexAlgorithm(LOCALE_EN));
         if (keyStr.isEmpty())
             throw RuntimeException();
     }
@@ -250,10 +250,10 @@ void Index::init(const lang::Locale &rLocale, const OUString& algorithm) throw (
 {
     makeIndexKeys(rLocale, algorithm);
 
-    Sequence< UnicodeScript > scriptList = LocaleData().getUnicodeScripts( rLocale );
+    Sequence< UnicodeScript > scriptList = LocaleDataImpl().getUnicodeScripts( rLocale );
 
     if (scriptList.getLength() == 0) {
-        scriptList = LocaleData().getUnicodeScripts(LOCALE_EN);
+        scriptList = LocaleDataImpl().getUnicodeScripts(LOCALE_EN);
         if (scriptList.getLength() == 0)
             throw RuntimeException();
     }

i18npool/source/nativenumber/nativenumbersupplier.cxx

@@ -573,7 +573,7 @@ OUString SAL_CALL NativeNumberSupplier::getNativeNumberString(const OUString& aN
             if (!aLocale.Language.equals(rLocale.Language) ||
                     !aLocale.Country.equals(rLocale.Country) ||
                     !aLocale.Variant.equals(rLocale.Variant)) {
-                LocaleDataItem item = LocaleData().getLocaleItem( rLocale );
+                LocaleDataItem item = LocaleDataImpl().getLocaleItem( rLocale );
                 aLocale = rLocale;
                 DecimalChar[NumberChar_HalfWidth]=item.decimalSeparator.toChar();
                 if (DecimalChar[NumberChar_HalfWidth] > 0x7E || DecimalChar[NumberChar_HalfWidth] < 0x21)

i18npool/source/registerservices/registerservices.cxx

@@ -118,7 +118,7 @@ using namespace i18n;
 
 IMPL_CREATEINSTANCE_CTX( NumberFormatCodeMapper )
 IMPL_CREATEINSTANCE( NativeNumberSupplier )
-IMPL_CREATEINSTANCE( LocaleData )
+IMPL_CREATEINSTANCE( LocaleDataImpl )
 IMPL_CREATEINSTANCE_CTX( DefaultNumberingProvider )
 IMPL_CREATEINSTANCE_CTX( IndexEntrySupplier )
 IMPL_CREATEINSTANCE_CTX( IndexEntrySupplier_asian )
@@ -285,7 +285,7 @@ static const struct InstancesArray {
 } aInstances[] = {
     {   "com.sun.star.i18n.LocaleData",
         "com.sun.star.i18n.LocaleData",
-        & LocaleData_CreateInstance },
+        & LocaleDataImpl_CreateInstance },
     {   "com.sun.star.i18n.NumberFormatMapper",
         "com.sun.star.i18n.NumberFormatCodeMapper",
         & NumberFormatCodeMapper_CreateInstance },

i18npool/util/i18npool.component

@@ -118,7 +118,7 @@
   <implementation name="com.sun.star.i18n.InputSequenceChecker_th">
     <service name="com.sun.star.i18n.InputSequenceChecker_th"/>
   </implementation>
-  <implementation name="com.sun.star.i18n.LocaleData">
+  <implementation name="com.sun.star.i18n.LocaleDataImpl">
     <service name="com.sun.star.i18n.LocaleData"/>
   </implementation>
   <implementation name="com.sun.star.i18n.NativeNumberSupplier">