summaryrefslogtreecommitdiff
path: root/i18npool/source/calendar
diff options
context:
space:
mode:
authorGert Faller <gertfaller@aliceadsl.fr>2010-11-22 17:20:34 +0100
committerGert Faller <gertfaller@aliceadsl.fr>2010-11-22 17:20:34 +0100
commitd2cac56c6619b2b831d2f458b12b9771b78c83d2 (patch)
tree490f83ca8424ee7ec31f4721c307edc4501e1476 /i18npool/source/calendar
parenta23d54eed27736eda876e975c510d7b3c230c5b8 (diff)
RTL_CONSTASCII_USTRINGPARAM in libs-gui 03
Diffstat (limited to 'i18npool/source/calendar')
-rw-r--r--i18npool/source/calendar/calendarImpl.cxx6
-rw-r--r--i18npool/source/calendar/calendar_gregorian.cxx4
2 files changed, 5 insertions, 5 deletions
diff --git a/i18npool/source/calendar/calendarImpl.cxx b/i18npool/source/calendar/calendarImpl.cxx
index be3802ee9062..296fad980c87 100644
--- a/i18npool/source/calendar/calendarImpl.cxx
+++ b/i18npool/source/calendar/calendarImpl.cxx
@@ -82,7 +82,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::createFromAscii("com.sun.star.i18n.Calendar_") + uniqueID);
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.Calendar_")) + uniqueID);
if ( ! xI.is() ) {
// check if the calendar is defined in localedata, load gregorian calendar service.
@@ -90,7 +90,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::createFromAscii("com.sun.star.i18n.Calendar_gregorian"));
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.Calendar_gregorian")));
break;
}
}
@@ -304,7 +304,7 @@ CalendarImpl::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativ
OUString SAL_CALL
CalendarImpl::getImplementationName(void) throw( RuntimeException )
{
- return OUString::createFromAscii("com.sun.star.i18n.CalendarImpl");
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("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 51180b01d058..c4ebade521ed 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -190,7 +190,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::createFromAscii("ja"), OUString(), OUString());
+ com::sun::star::lang::Locale(OUString(RTL_CONSTASCII_USTRINGPARAM("ja")), OUString(), OUString());
if (idx == 0) return LocaleData().getLocaleItem(jaLocale).timeAM;
else if (idx == 1) return LocaleData().getLocaleItem(jaLocale).timePM;
else throw ERROR;
@@ -204,7 +204,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::createFromAscii("hanja"), rLocale);
+ Calendar_gregorian::loadCalendar(OUString(RTL_CONSTASCII_USTRINGPARAM("hanja")), rLocale);
}
static Era gengou_eraArray[] = {