diff options
15 files changed, 89 insertions, 89 deletions
diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx index 43fcdd715ac5..55d317020673 100644 --- a/i18npool/inc/localedata.hxx +++ b/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 ); diff --git a/i18npool/source/breakiterator/breakiterator_cjk.cxx b/i18npool/source/breakiterator/breakiterator_cjk.cxx index c853610f02ac..28f263157510 100644 --- a/i18npool/source/breakiterator/breakiterator_cjk.cxx +++ b/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"; } diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx index 549abd1c1289..63ebe53e3df2 100644 --- a/i18npool/source/breakiterator/breakiterator_unicode.cxx +++ b/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); 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 diff --git a/i18npool/source/characterclassification/characterclassificationImpl.cxx b/i18npool/source/characterclassification/characterclassificationImpl.cxx index 00f6506763f0..d1389b69ba0b 100644 --- a/i18npool/source/characterclassification/characterclassificationImpl.cxx +++ b/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); diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx index 89bfa057d8f7..7eaba045c572 100644 --- a/i18npool/source/collator/collator_unicode.cxx +++ b/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(); diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx index e7c215339a18..32c1c4f2d156 100644 --- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx +++ b/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 ) diff --git a/i18npool/source/indexentry/indexentrysupplier.cxx b/i18npool/source/indexentry/indexentrysupplier.cxx index 9c5ab1736483..8cd16a1b0ff0 100644 --- a/i18npool/source/indexentry/indexentrysupplier.cxx +++ b/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 ? diff --git a/i18npool/source/indexentry/indexentrysupplier_common.cxx b/i18npool/source/indexentry/indexentrysupplier_common.cxx index bd647b2b2476..e4dba3822821 100644 --- a/i18npool/source/indexentry/indexentrysupplier_common.cxx +++ b/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; diff --git a/i18npool/source/indexentry/indexentrysupplier_default.cxx b/i18npool/source/indexentry/indexentrysupplier_default.cxx index eba5beed2c33..cb54e22b730a 100644 --- a/i18npool/source/indexentry/indexentrysupplier_default.cxx +++ b/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(); } diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index 8b708abc13ca..2d92c5febe24 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -314,7 +314,7 @@ struct LocaleDataLookupTableItem // static -Sequence< CalendarItem > LocaleData::downcastCalendarItems( const Sequence< CalendarItem2 > & rCi ) +Sequence< CalendarItem > LocaleDataImpl::downcastCalendarItems( const Sequence< CalendarItem2 > & rCi ) { sal_Int32 nSize = rCi.getLength(); Sequence< CalendarItem > aCi( nSize); @@ -327,7 +327,7 @@ Sequence< CalendarItem > LocaleData::downcastCalendarItems( const Sequence< Cale // static -Calendar LocaleData::downcastCalendar( const Calendar2 & rC ) +Calendar LocaleDataImpl::downcastCalendar( const Calendar2 & rC ) { Calendar aCal( downcastCalendarItems( rC.Days), @@ -342,16 +342,16 @@ Calendar LocaleData::downcastCalendar( const Calendar2 & rC ) } -LocaleData::LocaleData() +LocaleDataImpl::LocaleDataImpl() { } -LocaleData::~LocaleData() +LocaleDataImpl::~LocaleDataImpl() { } LocaleDataItem SAL_CALL -LocaleData::getLocaleItem( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getLocaleItem( const Locale& rLocale ) throw(RuntimeException) { sal_Unicode **dataItem = NULL; @@ -455,7 +455,7 @@ oslGenericFunction SAL_CALL lcl_LookupTableHelper::getFunctionSymbolByName( if (aFbLocale == aLocale) bFallback = false; // may be a "language-only-locale" like Interlingua (ia) else - aFallback = LocaleData::getFirstLocaleServiceName( aFbLocale); + aFallback = LocaleDataImpl::getFirstLocaleServiceName( aFbLocale); } for ( sal_Int16 i = 0; i < nbOfLocales; i++) @@ -572,7 +572,7 @@ oslGenericFunction SAL_CALL lcl_LookupTableHelper::getFunctionSymbolByName( #define REF_ERAS 4 #define REF_OFFSET_COUNT 5 -Sequence< CalendarItem2 > &LocaleData::getCalendarItemByName(const OUString& name, +Sequence< CalendarItem2 > &LocaleDataImpl::getCalendarItemByName(const OUString& name, const Locale& rLocale, const Sequence< Calendar2 >& calendarsSeq, sal_Int16 item) throw(RuntimeException) { @@ -580,7 +580,7 @@ Sequence< CalendarItem2 > &LocaleData::getCalendarItemByName(const OUString& nam OUString aLocStr, id; sal_Int32 nLastUnder = name.lastIndexOf( cUnder); SAL_WARN_IF( nLastUnder < 1, "i18npool", - "LocaleData::getCalendarItemByName - no '_' or first in name can't be right: " << name); + "LocaleDataImpl::getCalendarItemByName - no '_' or first in name can't be right: " << name); if (nLastUnder >= 0) { aLocStr = name.copy( 0, nLastUnder); @@ -623,7 +623,7 @@ Sequence< CalendarItem2 > &LocaleData::getCalendarItemByName(const OUString& nam case REF_PMONTHS: return ref_cal.PartitiveMonths; default: - OSL_FAIL( "LocaleData::getCalendarItemByName: unhandled REF_* case"); + OSL_FAIL( "LocaleDataImpl::getCalendarItemByName: unhandled REF_* case"); // fallthru case REF_ERAS: return ref_cal.Eras; @@ -631,7 +631,7 @@ Sequence< CalendarItem2 > &LocaleData::getCalendarItemByName(const OUString& nam } -Sequence< CalendarItem2 > LocaleData::getCalendarItems( +Sequence< CalendarItem2 > LocaleDataImpl::getCalendarItems( sal_Unicode const * const * const allCalendars, sal_Int16 & rnOffset, const sal_Int16 nWhichItem, const sal_Int16 nCalendar, const Locale & rLocale, const Sequence< Calendar2 > & calendarsSeq ) @@ -673,7 +673,7 @@ Sequence< CalendarItem2 > LocaleData::getCalendarItems( } break; default: - OSL_FAIL( "LocaleData::getCalendarItems: unhandled REF_* case"); + OSL_FAIL( "LocaleDataImpl::getCalendarItems: unhandled REF_* case"); } } return aItems; @@ -681,7 +681,7 @@ Sequence< CalendarItem2 > LocaleData::getCalendarItems( Sequence< Calendar2 > SAL_CALL -LocaleData::getAllCalendars2( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getAllCalendars2( const Locale& rLocale ) throw(RuntimeException) { sal_Unicode const * const * allCalendars = NULL; @@ -727,7 +727,7 @@ LocaleData::getAllCalendars2( const Locale& rLocale ) throw(RuntimeException) Sequence< Calendar > SAL_CALL -LocaleData::getAllCalendars( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getAllCalendars( const Locale& rLocale ) throw(RuntimeException) { const Sequence< Calendar2 > aCal2( getAllCalendars2( rLocale)); sal_Int32 nLen = aCal2.getLength(); @@ -743,7 +743,7 @@ LocaleData::getAllCalendars( const Locale& rLocale ) throw(RuntimeException) Sequence< Currency2 > SAL_CALL -LocaleData::getAllCurrencies2( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getAllCurrencies2( const Locale& rLocale ) throw(RuntimeException) { sal_Unicode **allCurrencies = NULL; @@ -777,7 +777,7 @@ LocaleData::getAllCurrencies2( const Locale& rLocale ) throw(RuntimeException) Sequence< Currency > SAL_CALL -LocaleData::getAllCurrencies( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getAllCurrencies( const Locale& rLocale ) throw(RuntimeException) { Sequence< Currency2 > aCur2( getAllCurrencies2( rLocale)); sal_Int32 nLen = aCur2.getLength(); @@ -827,7 +827,7 @@ static const sal_Unicode * replace( sal_Unicode const * const formatCode, sal_Un } Sequence< FormatElement > SAL_CALL -LocaleData::getAllFormats( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getAllFormats( const Locale& rLocale ) throw(RuntimeException) { const int SECTIONS = 2; struct FormatSection @@ -839,7 +839,7 @@ LocaleData::getAllFormats( const Locale& rLocale ) throw(RuntimeException) sal_Int16 formatCount; FormatSection() : func(0), from(0), to(0), formatArray(0), formatCount(0) {} - sal_Int16 getFunc( LocaleData& rLocaleData, const Locale& rL, const char* pName ) + sal_Int16 getFunc( LocaleDataImpl& rLocaleData, const Locale& rL, const char* pName ) { func = reinterpret_cast<MyFunc_FormatCode>( rLocaleData.getFunctionSymbol( rL, pName)); if (func) @@ -878,7 +878,7 @@ LocaleData::getAllFormats( const Locale& rLocale ) throw(RuntimeException) Sequence< OUString > SAL_CALL -LocaleData::getDateAcceptancePatterns( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getDateAcceptancePatterns( const Locale& rLocale ) throw(RuntimeException) { sal_Unicode **patternsArray = NULL; @@ -909,7 +909,7 @@ LocaleData::getDateAcceptancePatterns( const Locale& rLocale ) throw(RuntimeExce #define COLLATOR_ELEMENTS 3 OUString SAL_CALL -LocaleData::getCollatorRuleByAlgorithm( const Locale& rLocale, const OUString& algorithm ) throw(RuntimeException) +LocaleDataImpl::getCollatorRuleByAlgorithm( const Locale& rLocale, const OUString& algorithm ) throw(RuntimeException) { MyFunc_Type func = (MyFunc_Type) getFunctionSymbol( rLocale, "getCollatorImplementation" ); if ( func ) { @@ -924,7 +924,7 @@ LocaleData::getCollatorRuleByAlgorithm( const Locale& rLocale, const OUString& a Sequence< Implementation > SAL_CALL -LocaleData::getCollatorImplementations( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getCollatorImplementations( const Locale& rLocale ) throw(RuntimeException) { sal_Unicode **collatorArray = NULL; @@ -949,7 +949,7 @@ LocaleData::getCollatorImplementations( const Locale& rLocale ) throw(RuntimeExc } Sequence< OUString > SAL_CALL -LocaleData::getCollationOptions( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getCollationOptions( const Locale& rLocale ) throw(RuntimeException) { sal_Unicode **optionsArray = NULL; @@ -971,7 +971,7 @@ LocaleData::getCollationOptions( const Locale& rLocale ) throw(RuntimeException) } Sequence< OUString > SAL_CALL -LocaleData::getSearchOptions( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getSearchOptions( const Locale& rLocale ) throw(RuntimeException) { sal_Unicode **optionsArray = NULL; @@ -993,7 +993,7 @@ LocaleData::getSearchOptions( const Locale& rLocale ) throw(RuntimeException) } sal_Unicode ** SAL_CALL -LocaleData::getIndexArray(const Locale& rLocale, sal_Int16& indexCount) +LocaleDataImpl::getIndexArray(const Locale& rLocale, sal_Int16& indexCount) { MyFunc_Type func = (MyFunc_Type) getFunctionSymbol( rLocale, "getIndexAlgorithm" ); @@ -1003,7 +1003,7 @@ LocaleData::getIndexArray(const Locale& rLocale, sal_Int16& indexCount) } Sequence< OUString > SAL_CALL -LocaleData::getIndexAlgorithm( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getIndexAlgorithm( const Locale& rLocale ) throw(RuntimeException) { sal_Int16 indexCount = 0; sal_Unicode **indexArray = getIndexArray(rLocale, indexCount); @@ -1022,7 +1022,7 @@ LocaleData::getIndexAlgorithm( const Locale& rLocale ) throw(RuntimeException) } OUString SAL_CALL -LocaleData::getDefaultIndexAlgorithm( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getDefaultIndexAlgorithm( const Locale& rLocale ) throw(RuntimeException) { sal_Int16 indexCount = 0; sal_Unicode **indexArray = getIndexArray(rLocale, indexCount); @@ -1037,7 +1037,7 @@ LocaleData::getDefaultIndexAlgorithm( const Locale& rLocale ) throw(RuntimeExcep } sal_Bool SAL_CALL -LocaleData::hasPhonetic( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::hasPhonetic( const Locale& rLocale ) throw(RuntimeException) { sal_Int16 indexCount = 0; sal_Unicode **indexArray = getIndexArray(rLocale, indexCount); @@ -1052,7 +1052,7 @@ LocaleData::hasPhonetic( const Locale& rLocale ) throw(RuntimeException) } sal_Unicode ** SAL_CALL -LocaleData::getIndexArrayForAlgorithm(const Locale& rLocale, const OUString& algorithm) +LocaleDataImpl::getIndexArrayForAlgorithm(const Locale& rLocale, const OUString& algorithm) { sal_Int16 indexCount = 0; sal_Unicode **indexArray = getIndexArray(rLocale, indexCount); @@ -1066,28 +1066,28 @@ LocaleData::getIndexArrayForAlgorithm(const Locale& rLocale, const OUString& alg } sal_Bool SAL_CALL -LocaleData::isPhonetic( const Locale& rLocale, const OUString& algorithm ) throw(RuntimeException) +LocaleDataImpl::isPhonetic( const Locale& rLocale, const OUString& algorithm ) throw(RuntimeException) { sal_Unicode **indexArray = getIndexArrayForAlgorithm(rLocale, algorithm); return (indexArray && indexArray[4][0]) ? sal_True : sal_False; } OUString SAL_CALL -LocaleData::getIndexKeysByAlgorithm( const Locale& rLocale, const OUString& algorithm ) throw(RuntimeException) +LocaleDataImpl::getIndexKeysByAlgorithm( const Locale& rLocale, const OUString& algorithm ) throw(RuntimeException) { sal_Unicode **indexArray = getIndexArrayForAlgorithm(rLocale, algorithm); return indexArray ? OUString("0-9")+OUString(indexArray[2]) : OUString(); } OUString SAL_CALL -LocaleData::getIndexModuleByAlgorithm( const Locale& rLocale, const OUString& algorithm ) throw(RuntimeException) +LocaleDataImpl::getIndexModuleByAlgorithm( const Locale& rLocale, const OUString& algorithm ) throw(RuntimeException) { sal_Unicode **indexArray = getIndexArrayForAlgorithm(rLocale, algorithm); return indexArray ? OUString(indexArray[1]) : OUString(); } Sequence< UnicodeScript > SAL_CALL -LocaleData::getUnicodeScripts( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getUnicodeScripts( const Locale& rLocale ) throw(RuntimeException) { sal_Unicode **scriptArray = NULL; @@ -1109,7 +1109,7 @@ LocaleData::getUnicodeScripts( const Locale& rLocale ) throw(RuntimeException) } Sequence< OUString > SAL_CALL -LocaleData::getFollowPageWords( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getFollowPageWords( const Locale& rLocale ) throw(RuntimeException) { sal_Unicode **wordArray = NULL; @@ -1131,7 +1131,7 @@ LocaleData::getFollowPageWords( const Locale& rLocale ) throw(RuntimeException) } Sequence< OUString > SAL_CALL -LocaleData::getTransliterations( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getTransliterations( const Locale& rLocale ) throw(RuntimeException) { sal_Unicode **transliterationsArray = NULL; @@ -1159,7 +1159,7 @@ LocaleData::getTransliterations( const Locale& rLocale ) throw(RuntimeException) LanguageCountryInfo SAL_CALL -LocaleData::getLanguageCountryInfo( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getLanguageCountryInfo( const Locale& rLocale ) throw(RuntimeException) { sal_Unicode **LCInfoArray = NULL; @@ -1185,7 +1185,7 @@ LocaleData::getLanguageCountryInfo( const Locale& rLocale ) throw(RuntimeExcepti ForbiddenCharacters SAL_CALL -LocaleData::getForbiddenCharacters( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getForbiddenCharacters( const Locale& rLocale ) throw(RuntimeException) { sal_Unicode **LCForbiddenCharactersArray = NULL; @@ -1204,7 +1204,7 @@ LocaleData::getForbiddenCharacters( const Locale& rLocale ) throw(RuntimeExcepti } OUString SAL_CALL -LocaleData::getHangingCharacters( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getHangingCharacters( const Locale& rLocale ) throw(RuntimeException) { sal_Unicode **LCForbiddenCharactersArray = NULL; @@ -1220,7 +1220,7 @@ LocaleData::getHangingCharacters( const Locale& rLocale ) throw(RuntimeException } Sequence< OUString > SAL_CALL -LocaleData::getBreakIteratorRules( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getBreakIteratorRules( const Locale& rLocale ) throw(RuntimeException) { sal_Unicode **LCBreakIteratorRulesArray = NULL; @@ -1244,7 +1244,7 @@ LocaleData::getBreakIteratorRules( const Locale& rLocale ) throw(RuntimeExcepti Sequence< OUString > SAL_CALL -LocaleData::getReservedWord( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getReservedWord( const Locale& rLocale ) throw(RuntimeException) { sal_Unicode **LCReservedWordsArray = NULL; @@ -1268,7 +1268,7 @@ LocaleData::getReservedWord( const Locale& rLocale ) throw(RuntimeException) Sequence< Sequence<beans::PropertyValue> > SAL_CALL -LocaleData::getContinuousNumberingLevels( const lang::Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getContinuousNumberingLevels( const lang::Locale& rLocale ) throw(RuntimeException) { // load symbol MyFunc_Type2 func = (MyFunc_Type2) getFunctionSymbol( rLocale, "getContinuousNumberingLevels" ); @@ -1391,7 +1391,7 @@ static sal_Char* U2C( OUString str ) Sequence< Reference<container::XIndexAccess> > SAL_CALL -LocaleData::getOutlineNumberingLevels( const lang::Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getOutlineNumberingLevels( const lang::Locale& rLocale ) throw(RuntimeException) { // load symbol MyFunc_Type3 func = (MyFunc_Type3) getFunctionSymbol( rLocale, "getOutlineNumberingLevels" ); @@ -1464,7 +1464,7 @@ LocaleData::getOutlineNumberingLevels( const lang::Locale& rLocale ) throw(Runti // helper functions -oslGenericFunction SAL_CALL LocaleData::getFunctionSymbol( const Locale& rLocale, const sal_Char* pFunction ) +oslGenericFunction SAL_CALL LocaleDataImpl::getFunctionSymbol( const Locale& rLocale, const sal_Char* pFunction ) throw(RuntimeException) { lcl_LookupTableHelper & rLookupTable = lcl_LookupTableStatic::get(); @@ -1482,11 +1482,11 @@ oslGenericFunction SAL_CALL LocaleData::getFunctionSymbol( const Locale& rLocale // Load function with name <func>_<lang>_<country> or <func>_<bcp47> and // fallbacks. - pSymbol = rLookupTable.getFunctionSymbolByName( LocaleData::getFirstLocaleServiceName( rLocale), + pSymbol = rLookupTable.getFunctionSymbolByName( LocaleDataImpl::getFirstLocaleServiceName( rLocale), pFunction, &pCachedItem); if (!pSymbol) { - ::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) { pSymbol = rLookupTable.getFunctionSymbolByName( *it, pFunction, &pCachedItem); @@ -1513,7 +1513,7 @@ oslGenericFunction SAL_CALL LocaleData::getFunctionSymbol( const Locale& rLocale } Sequence< Locale > SAL_CALL -LocaleData::getAllInstalledLocaleNames() throw(RuntimeException) +LocaleDataImpl::getAllInstalledLocaleNames() throw(RuntimeException) { Sequence< lang::Locale > seq( nbOfLocales ); OUString empStr; @@ -1612,20 +1612,20 @@ sal_Bool OutlineNumbering::hasElements( ) throw(RuntimeException) } OUString SAL_CALL -LocaleData::getImplementationName() throw( RuntimeException ) +LocaleDataImpl::getImplementationName() throw( RuntimeException ) { return OUString(clocaledata); } sal_Bool SAL_CALL -LocaleData::supportsService(const OUString& rServiceName) +LocaleDataImpl::supportsService(const OUString& rServiceName) throw( RuntimeException ) { return rServiceName == clocaledata; } Sequence< OUString > SAL_CALL -LocaleData::getSupportedServiceNames() throw( RuntimeException ) +LocaleDataImpl::getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > aRet(1); aRet[0] = OUString(clocaledata); @@ -1633,7 +1633,7 @@ LocaleData::getSupportedServiceNames() throw( RuntimeException ) } // static -OUString LocaleData::getFirstLocaleServiceName( const com::sun::star::lang::Locale & rLocale ) +OUString LocaleDataImpl::getFirstLocaleServiceName( const com::sun::star::lang::Locale & rLocale ) { if (rLocale.Language == I18NLANGTAG_QLT) return rLocale.Variant.replace( cHyphen, cUnder); @@ -1644,7 +1644,7 @@ OUString LocaleData::getFirstLocaleServiceName( const com::sun::star::lang::Loca } // static -::std::vector< OUString > LocaleData::getFallbackLocaleServiceNames( const com::sun::star::lang::Locale & rLocale ) +::std::vector< OUString > LocaleDataImpl::getFallbackLocaleServiceNames( const com::sun::star::lang::Locale & rLocale ) { ::std::vector< OUString > aVec; if (rLocale.Language == I18NLANGTAG_QLT) diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx index cb99fef3ce06..b85aadea8300 100644 --- a/i18npool/source/nativenumber/nativenumbersupplier.cxx +++ b/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) diff --git a/i18npool/source/registerservices/registerservices.cxx b/i18npool/source/registerservices/registerservices.cxx index ca87c024ef6f..9e1a42696ff9 100644 --- a/i18npool/source/registerservices/registerservices.cxx +++ b/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 }, diff --git a/i18npool/util/i18npool.component b/i18npool/util/i18npool.component index 559d0bf834b7..2373006a38e0 100644 --- a/i18npool/util/i18npool.component +++ b/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"> |