diff options
Diffstat (limited to 'i18npool/source/calendar')
| -rw-r--r-- | i18npool/source/calendar/calendarImpl.cxx | 6 | ||||
| -rw-r--r-- | i18npool/source/calendar/calendar_gregorian.cxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/i18npool/source/calendar/calendarImpl.cxx b/i18npool/source/calendar/calendarImpl.cxx index 3831af64db55..5f4859e68a9f 100644 --- a/i18npool/source/calendar/calendarImpl.cxx +++ b/i18npool/source/calendar/calendarImpl.cxx @@ -81,7 +81,7 @@ CalendarImpl::loadCalendar(const OUString& uniqueID, const Locale& rLocale ) thr if (i >= sal::static_int_cast<sal_Int32>(lookupTable.size())) { Reference < XInterface > xI = xMSF->createInstance( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.Calendar_")) + uniqueID); + OUString("com.sun.star.i18n.Calendar_") + uniqueID); if ( ! xI.is() ) { // check if the calendar is defined in localedata, load gregorian calendar service. @@ -89,7 +89,7 @@ CalendarImpl::loadCalendar(const OUString& uniqueID, const Locale& rLocale ) thr for (i = 0; i < xC.getLength(); i++) { if (uniqueID == xC[i].Name) { xI = xMSF->createInstance( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.Calendar_gregorian"))); + OUString("com.sun.star.i18n.Calendar_gregorian")); break; } } @@ -352,7 +352,7 @@ CalendarImpl::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativ OUString SAL_CALL CalendarImpl::getImplementationName(void) throw( RuntimeException ) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.CalendarImpl")); + return OUString("com.sun.star.i18n.CalendarImpl"); } const sal_Char cCalendar[] = "com.sun.star.i18n.LocaleCalendar"; diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx index f726aeb0fc38..e32d39121b0f 100644 --- a/i18npool/source/calendar/calendar_gregorian.cxx +++ b/i18npool/source/calendar/calendar_gregorian.cxx @@ -191,7 +191,7 @@ Calendar_hanja::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_Int16 if ( displayIndex == CalendarDisplayIndex::AM_PM ) { // Am/Pm string for Korean Hanja calendar will refer to Japanese locale com::sun::star::lang::Locale jaLocale = - com::sun::star::lang::Locale(OUString(RTL_CONSTASCII_USTRINGPARAM("ja")), OUString(), OUString()); + 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; else throw ERROR; @@ -205,7 +205,7 @@ Calendar_hanja::loadCalendar( const OUString& /*uniqueID*/, const com::sun::star { // Since this class could be called by service name 'hanja_yoil', we have to // rename uniqueID to get right calendar defined in locale data. - Calendar_gregorian::loadCalendar(OUString(RTL_CONSTASCII_USTRINGPARAM("hanja")), rLocale); + Calendar_gregorian::loadCalendar(OUString("hanja"), rLocale); } static Era gengou_eraArray[] = { |