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

2 files changed, 12 insertions, 12 deletions

diff --git a/i18npool/source/calendar/calendarImpl.cxx b/i18npool/source/calendar/calendarImpl.cxx
index 1d0e2b4e9575..e88427d014f5 100644
--- a/i18npool/source/calendar/calendarImpl.cxx
+++ b/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++)
diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx
index b3322fa6e338..dddeea78f65b 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/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