[Libreoffice-commits] .: 2 commits - i18npool/source jvmfwk/source
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Wed May 30 14:42:28 PDT 2012
i18npool/source/breakiterator/breakiteratorImpl.cxx | 4 -
i18npool/source/breakiterator/xdictionary.cxx | 10 +-
i18npool/source/calendar/calendarImpl.cxx | 6 -
i18npool/source/calendar/calendar_gregorian.cxx | 4 -
i18npool/source/characterclassification/characterclassificationImpl.cxx | 8 +-
i18npool/source/collator/chaptercollator.cxx | 4 -
i18npool/source/collator/collatorImpl.cxx | 8 +-
i18npool/source/collator/collator_unicode.cxx | 4 -
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx | 38 +++++-----
i18npool/source/indexentry/indexentrysupplier.cxx | 4 -
i18npool/source/indexentry/indexentrysupplier_asian.cxx | 12 +--
i18npool/source/indexentry/indexentrysupplier_default.cxx | 2
i18npool/source/inputchecker/inputsequencechecker.cxx | 2
i18npool/source/localedata/LocaleNode.cxx | 26 +++---
i18npool/source/localedata/localedata.cxx | 8 +-
i18npool/source/localedata/saxparser.cxx | 4 -
i18npool/source/numberformatcode/numberformatcode.cxx | 26 +++---
i18npool/source/search/textsearch.cxx | 12 +--
i18npool/source/textconversion/textconversionImpl.cxx | 12 +--
i18npool/source/textconversion/textconversion_ko.cxx | 8 +-
i18npool/source/textconversion/textconversion_zh.cxx | 2
i18npool/source/transliteration/transliterationImpl.cxx | 8 +-
jvmfwk/source/fwkutil.cxx | 10 +-
23 files changed, 111 insertions(+), 111 deletions(-)
New commits:
commit d79705d1dfea05745494cc00c5963f4b40628393
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed May 30 16:12:54 2012 -0500
targeted string re-work
Change-Id: I31c752d044774cf4cec4aaab9bb2e43570d41953
diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx
index 670898c..a3976bf 100644
--- a/jvmfwk/source/fwkutil.cxx
+++ b/jvmfwk/source/fwkutil.cxx
@@ -69,7 +69,7 @@ bool isAccessibilitySupportDesired()
{
OUString sValue;
if ((sal_True == ::rtl::Bootstrap::get(
- OUString(RTL_CONSTASCII_USTRINGPARAM("JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY")), sValue)) && sValue == "1"
+ OUString("JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY"), sValue)) && sValue == "1"
)
return false;
@@ -260,7 +260,7 @@ rtl::OUString findPlugin(
}
rtl::OUString retVal;
rtl::OUString sProgDir = getExecutableDirectory();
- sUrl = sProgDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"))
+ sUrl = sProgDir + rtl::OUString("/")
+ plugin;
jfw::FileStatus s = checkFileURL(sUrl);
if (s == jfw::FILE_INVALID || s == jfw::FILE_DOES_NOT_EXIST)
@@ -272,11 +272,11 @@ rtl::OUString findPlugin(
rtl::OUString url;
#ifdef UNX
#if defined(MACOSX)
- rtl::OUString path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DYLD_LIBRARY_PATH"));
+ rtl::OUString path = rtl::OUString("DYLD_LIBRARY_PATH");
#elif defined(AIX)
- rtl::OUString path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LIBPATH"));
+ rtl::OUString path = rtl::OUString("LIBPATH");
#else
- rtl::OUString path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LD_LIBRARY_PATH"));
+ rtl::OUString path = rtl::OUString("LD_LIBRARY_PATH");
#endif
rtl::OUString env_path;
oslProcessError err = osl_getEnvironment(path.pData, &env_path.pData);
commit 1488171272e5e9d11f751482e3e372e5db58418b
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed May 30 15:00:23 2012 -0500
targeted string re-work
Change-Id: I1efff8e09079267f4129c474872d3fc49adeb831
diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx
index 8201453..adb80b7 100644
--- a/i18npool/source/breakiterator/breakiteratorImpl.cxx
+++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx
@@ -555,7 +555,7 @@ sal_Bool SAL_CALL BreakIteratorImpl::createLocaleSpecificBreakIterator(const OUS
}
Reference < uno::XInterface > xI = xMSF->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator_")) + aLocaleName);
+ OUString("com.sun.star.i18n.BreakIterator_") + aLocaleName);
if ( xI.is() ) {
xI->queryInterface( getCppuType((const Reference< XBreakIterator>*)0) ) >>= xBI;
@@ -606,7 +606,7 @@ BreakIteratorImpl::getLocaleSpecificBreakIterator(const Locale& rLocale) throw (
// load service with name <base>_<lang>
createLocaleSpecificBreakIterator(rLocale.Language)) ||
// load default service with name <base>_Unicode
- createLocaleSpecificBreakIterator(OUString(RTL_CONSTASCII_USTRINGPARAM("Unicode")))) {
+ createLocaleSpecificBreakIterator(OUString("Unicode"))) {
lookupTable.push_back( new lookupTableItem(aLocale, xBI) );
return xBI;
}
diff --git a/i18npool/source/breakiterator/xdictionary.cxx b/i18npool/source/breakiterator/xdictionary.cxx
index 540bce8..e4da13d 100644
--- a/i18npool/source/breakiterator/xdictionary.cxx
+++ b/i18npool/source/breakiterator/xdictionary.cxx
@@ -97,15 +97,15 @@ xdictionary::xdictionary(const sal_Char *lang) :
hModule = osl_loadModuleRelative( &thisModule, aBuf.makeStringAndClear().pData, SAL_LOADMODULE_DEFAULT );
if( hModule ) {
sal_IntPtr (*func)();
- func = (sal_IntPtr(*)()) osl_getFunctionSymbol( hModule, OUString(RTL_CONSTASCII_USTRINGPARAM("getExistMark")).pData );
+ func = (sal_IntPtr(*)()) osl_getFunctionSymbol( hModule, OUString("getExistMark").pData );
existMark = (sal_uInt8*) (*func)();
- func = (sal_IntPtr(*)()) osl_getFunctionSymbol( hModule, OUString(RTL_CONSTASCII_USTRINGPARAM("getIndex1")).pData );
+ func = (sal_IntPtr(*)()) osl_getFunctionSymbol( hModule, OUString("getIndex1").pData );
index1 = (sal_Int16*) (*func)();
- func = (sal_IntPtr(*)()) osl_getFunctionSymbol( hModule, OUString(RTL_CONSTASCII_USTRINGPARAM("getIndex2")).pData );
+ func = (sal_IntPtr(*)()) osl_getFunctionSymbol( hModule, OUString("getIndex2").pData );
index2 = (sal_Int32*) (*func)();
- func = (sal_IntPtr(*)()) osl_getFunctionSymbol( hModule, OUString(RTL_CONSTASCII_USTRINGPARAM("getLenArray")).pData );
+ func = (sal_IntPtr(*)()) osl_getFunctionSymbol( hModule, OUString("getLenArray").pData );
lenArray = (sal_Int32*) (*func)();
- func = (sal_IntPtr(*)()) osl_getFunctionSymbol( hModule, OUString(RTL_CONSTASCII_USTRINGPARAM("getDataArea")).pData );
+ func = (sal_IntPtr(*)()) osl_getFunctionSymbol( hModule, OUString("getDataArea").pData );
dataArea = (sal_Unicode*) (*func)();
}
else
diff --git a/i18npool/source/calendar/calendarImpl.cxx b/i18npool/source/calendar/calendarImpl.cxx
index 3831af6..5f4859e 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 f726aeb..e32d391 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[] = {
diff --git a/i18npool/source/characterclassification/characterclassificationImpl.cxx b/i18npool/source/characterclassification/characterclassificationImpl.cxx
index aed95e0..70d1683 100644
--- a/i18npool/source/characterclassification/characterclassificationImpl.cxx
+++ b/i18npool/source/characterclassification/characterclassificationImpl.cxx
@@ -41,7 +41,7 @@ namespace com { namespace sun { namespace star { namespace i18n {
CharacterClassificationImpl::CharacterClassificationImpl(
const Reference < lang::XMultiServiceFactory >& rxMSF ) : xMSF( rxMSF )
{
- if (createLocaleSpecificCharacterClassification(OUString(RTL_CONSTASCII_USTRINGPARAM("Unicode")), Locale()))
+ if (createLocaleSpecificCharacterClassification(OUString("Unicode"), Locale()))
xUCI = cachedItem->xCI;
}
@@ -150,7 +150,7 @@ sal_Bool SAL_CALL CharacterClassificationImpl::createLocaleSpecificCharacterClas
}
Reference < XInterface > xI = xMSF->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.CharacterClassification_")) + serviceName);
+ OUString("com.sun.star.i18n.CharacterClassification_") + serviceName);
Reference < XCharacterClassification > xCI;
if ( xI.is() ) {
@@ -178,7 +178,7 @@ CharacterClassificationImpl::getLocaleSpecificCharacterClassification(const Loca
}
static sal_Unicode under = (sal_Unicode)'_';
- static OUString tw(RTL_CONSTASCII_USTRINGPARAM("TW"));
+ static OUString tw("TW");
sal_Int32 l = rLocale.Language.getLength();
sal_Int32 c = rLocale.Country.getLength();
sal_Int32 v = rLocale.Variant.getLength();
@@ -203,7 +203,7 @@ CharacterClassificationImpl::getLocaleSpecificCharacterClassification(const Loca
createLocaleSpecificCharacterClassification(rLocale.Language, rLocale))) {
return cachedItem->xCI;
} else if (xUCI.is()) {
- lookupTable.push_back( cachedItem = new lookupTableItem(rLocale, OUString(RTL_CONSTASCII_USTRINGPARAM("Unicode")), xUCI) );
+ lookupTable.push_back( cachedItem = new lookupTableItem(rLocale, OUString("Unicode"), xUCI) );
return cachedItem->xCI;
}
}
diff --git a/i18npool/source/collator/chaptercollator.cxx b/i18npool/source/collator/chaptercollator.cxx
index f9e3c56..3f2b2f1 100644
--- a/i18npool/source/collator/chaptercollator.cxx
+++ b/i18npool/source/collator/chaptercollator.cxx
@@ -43,7 +43,7 @@ ChapterCollator::ChapterCollator( const Reference < XMultiServiceFactory >& rxMS
{
if ( rxMSF.is()) {
Reference < XInterface > xI =
- rxMSF->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.CharacterClassification")));
+ rxMSF->createInstance( OUString("com.sun.star.i18n.CharacterClassification"));
if ( xI.is() )
xI->queryInterface(::getCppuType((const Reference< XCharacterClassification>*)0)) >>= cclass;
}
@@ -76,7 +76,7 @@ ChapterCollator::compareSubstring( const OUString& str1, sal_Int32 off1, sal_Int
if( ans != 0 )
return ans;
- const OUString aAddAllowed(RTL_CONSTASCII_USTRINGPARAM("?"));
+ const OUString aAddAllowed("?");
ParseResult res1, res2;
// since parseAnyToken does not take length as parameter, we have to copy
// it to a temp. string.
diff --git a/i18npool/source/collator/collatorImpl.cxx b/i18npool/source/collator/collatorImpl.cxx
index 49f193e..93cc2a6 100644
--- a/i18npool/source/collator/collatorImpl.cxx
+++ b/i18npool/source/collator/collatorImpl.cxx
@@ -44,7 +44,7 @@ CollatorImpl::CollatorImpl( const Reference < XMultiServiceFactory >& rxMSF ) :
{
if ( rxMSF.is()) {
Reference < XInterface > xI =
- xMSF->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.LocaleData")));
+ xMSF->createInstance( OUString("com.sun.star.i18n.LocaleData"));
if ( xI.is() )
xI->queryInterface(::getCppuType((const Reference< XLocaleData>*)0)) >>= localedata;
}
@@ -168,7 +168,7 @@ CollatorImpl::createCollator(const lang::Locale& rLocale, const OUString& servic
}
if (xMSF.is()) {
Reference < XInterface > xI =
- xMSF->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.Collator_")) + serviceName);
+ xMSF->createInstance(OUString("com.sun.star.i18n.Collator_") + serviceName);
if (xI.is()) {
Reference < XCollator > xC;
@@ -195,8 +195,8 @@ CollatorImpl::loadCachedCollator(const lang::Locale& rLocale, const OUString& rS
}
static sal_Unicode under = (sal_Unicode) '_';
- static OUString tw(RTL_CONSTASCII_USTRINGPARAM("TW"));
- static OUString unicode(RTL_CONSTASCII_USTRINGPARAM("Unicode"));
+ static OUString tw("TW");
+ static OUString unicode("Unicode");
sal_Int32 l = rLocale.Language.getLength();
sal_Int32 c = rLocale.Country.getLength();
diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx
index 7cbb598..02aea53 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -138,9 +138,9 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
aBuf.appendAscii("get_").append(rLocale.Language).appendAscii("_");
if ( rLocale.Language == "zh" ) {
OUString func_base = aBuf.makeStringAndClear();
- if (OUString(RTL_CONSTASCII_USTRINGPARAM("TW HK MO")).indexOf(rLocale.Country) >= 0)
+ if (OUString("TW HK MO").indexOf(rLocale.Country) >= 0)
func=(const sal_uInt8* (*)()) osl_getFunctionSymbol(hModule,
- (func_base + OUString(RTL_CONSTASCII_USTRINGPARAM("TW_")) + rAlgorithm).pData);
+ (func_base + OUString("TW_") + rAlgorithm).pData);
if (!func)
func=(const sal_uInt8* (*)()) osl_getFunctionSymbol(hModule, (func_base + rAlgorithm).pData);
} else {
diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 27a673d..8679b67 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -634,10 +634,10 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal
result += OUString::valueOf( number );
break;
case NUMBER_NONE:
- return OUString(RTL_CONSTASCII_USTRINGPARAM("")); // ignore prefix and suffix
+ return OUString(""); // ignore prefix and suffix
case CHAR_SPECIAL:
// apparently, we're supposed to return an empty string in this case...
- return OUString(RTL_CONSTASCII_USTRINGPARAM("")); // ignore prefix and suffix
+ return OUString(""); // ignore prefix and suffix
case PAGE_DESCRIPTOR:
case BITMAP:
OSL_ASSERT(0);
@@ -673,25 +673,25 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal
break;
case NUMBER_LOWER_ZH:
natNum = NativeNumberMode::NATNUM7;
- locale.Language = OUString(RTL_CONSTASCII_USTRINGPARAM("zh"));
+ locale.Language = OUString("zh");
break;
case NUMBER_UPPER_ZH_TW:
- locale.Country = OUString(RTL_CONSTASCII_USTRINGPARAM("TW"));
+ locale.Country = OUString("TW");
case NUMBER_UPPER_ZH:
natNum = NativeNumberMode::NATNUM8;
- locale.Language = OUString(RTL_CONSTASCII_USTRINGPARAM("zh"));
+ locale.Language = OUString("zh");
break;
case NUMBER_TRADITIONAL_JA:
natNum = NativeNumberMode::NATNUM8;
- locale.Language = OUString(RTL_CONSTASCII_USTRINGPARAM("ja"));
+ locale.Language = OUString("ja");
break;
case NUMBER_UPPER_KO:
natNum = NativeNumberMode::NATNUM8;
- locale.Language = OUString(RTL_CONSTASCII_USTRINGPARAM("ko"));
+ locale.Language = OUString("ko");
break;
case NUMBER_HANGUL_KO:
natNum = NativeNumberMode::NATNUM11;
- locale.Language = OUString(RTL_CONSTASCII_USTRINGPARAM("ko"));
+ locale.Language = OUString("ko");
break;
case CIRCLE_NUMBER:
@@ -955,17 +955,17 @@ OUString DefaultNumberingProvider::makeNumberingIdentifier(sal_Int16 index)
// return OUString::createFromAscii(aSupportedTypes[index].cSymbol);
else {
OUString result;
- Locale aLocale(OUString(RTL_CONSTASCII_USTRINGPARAM("en")), OUString(), OUString());
+ Locale aLocale(OUString("en"), OUString(), OUString());
Sequence<beans::PropertyValue> aProperties(2);
- aProperties[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("NumberingType"));
+ aProperties[0].Name = OUString("NumberingType");
aProperties[0].Value <<= aSupportedTypes[index].nType;
- aProperties[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("Value"));
+ aProperties[1].Name = OUString("Value");
for (sal_Int32 j = 1; j <= 3; j++) {
aProperties[1].Value <<= j;
result += makeNumberingString( aProperties, aLocale );
- result += OUString(RTL_CONSTASCII_USTRINGPARAM(", "));
+ result += OUString(", ");
}
- result += OUString(RTL_CONSTASCII_USTRINGPARAM("..."));
+ result += OUString("...");
return result;
}
}
@@ -976,7 +976,7 @@ DefaultNumberingProvider::isScriptFlagEnabled(const OUString& aName) throw(Runti
if (! xHierarchicalNameAccess.is()) {
Reference< XInterface > xInterface;
- xInterface = xSMgr->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider")));
+ xInterface = xSMgr->createInstance(OUString("com.sun.star.configuration.ConfigurationProvider"));
Reference< XMultiServiceFactory > xConfigProvider =
Reference< XMultiServiceFactory >(xInterface, UNO_QUERY );
@@ -985,12 +985,12 @@ DefaultNumberingProvider::isScriptFlagEnabled(const OUString& aName) throw(Runti
Sequence< Any > aArgs(1);
beans::PropertyValue aPath;
- aPath.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath"));
- aPath.Value <<= OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Common/I18N")),
+ aPath.Name = OUString("nodepath");
+ aPath.Value <<= OUString("/org.openoffice.Office.Common/I18N"),
aArgs[0] <<= aPath;
xInterface = xConfigProvider->createInstanceWithArguments(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")), aArgs);
+ OUString("com.sun.star.configuration.ConfigurationAccess"), aArgs);
xHierarchicalNameAccess.set(xInterface, UNO_QUERY);
@@ -1013,8 +1013,8 @@ Sequence< sal_Int16 > DefaultNumberingProvider::getSupportedNumberingTypes( )
Sequence< sal_Int16 > aRet(nSupported_NumberingTypes );
sal_Int16* pArray = aRet.getArray();
- sal_Bool cjkEnabled = isScriptFlagEnabled(OUString(RTL_CONSTASCII_USTRINGPARAM("CJK/CJKFont")));
- sal_Bool ctlEnabled = isScriptFlagEnabled(OUString(RTL_CONSTASCII_USTRINGPARAM("CTL/CTLFont")));
+ sal_Bool cjkEnabled = isScriptFlagEnabled(OUString("CJK/CJKFont"));
+ sal_Bool ctlEnabled = isScriptFlagEnabled(OUString("CTL/CTLFont"));
for(sal_Int16 i = 0; i < nSupported_NumberingTypes; i++) {
if ( (aSupportedTypes[i].langOption & LANG_ALL) ||
diff --git a/i18npool/source/indexentry/indexentrysupplier.cxx b/i18npool/source/indexentry/indexentrysupplier.cxx
index 3d87914..89ad1d9 100644
--- a/i18npool/source/indexentry/indexentrysupplier.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier.cxx
@@ -111,7 +111,7 @@ OUString SAL_CALL IndexEntrySupplier::getIndexCharacter( const OUString& rIndexE
sal_Bool SAL_CALL IndexEntrySupplier::createLocaleSpecificIndexEntrySupplier(const OUString& name) throw( RuntimeException )
{
Reference < XInterface > xI = xMSF->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.IndexEntrySupplier_")) + name);
+ OUString("com.sun.star.i18n.IndexEntrySupplier_") + name);
if ( xI.is() ) {
xI->queryInterface( ::getCppuType((const Reference< com::sun::star::i18n::XExtendedIndexEntrySupplier>*)0) ) >>= xIES;
@@ -166,7 +166,7 @@ IndexEntrySupplier::getLocaleSpecificIndexEntrySupplier(const Locale& rLocale, c
// load service with name <base>_<algorithm>
(a > 0 && createLocaleSpecificIndexEntrySupplier(aSortAlgorithm)) ||
// load default service with name <base>_Unicode
- createLocaleSpecificIndexEntrySupplier(OUString(RTL_CONSTASCII_USTRINGPARAM("Unicode")))) {
+ createLocaleSpecificIndexEntrySupplier(OUString("Unicode"))) {
return xIES;
}
}
diff --git a/i18npool/source/indexentry/indexentrysupplier_asian.cxx b/i18npool/source/indexentry/indexentrysupplier_asian.cxx
index 2e9ca93..fa697d2 100644
--- a/i18npool/source/indexentry/indexentrysupplier_asian.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_asian.cxx
@@ -49,9 +49,9 @@ IndexEntrySupplier_asian::IndexEntrySupplier_asian(
implementationName = "com.sun.star.i18n.IndexEntrySupplier_asian";
#ifndef DISABLE_DYNLOADING
#ifdef SAL_DLLPREFIX
- OUString lib(RTL_CONSTASCII_USTRINGPARAM(SAL_DLLPREFIX"index_data" SAL_DLLEXTENSION));
+ OUString lib(SAL_DLLPREFIX"index_data" SAL_DLLEXTENSION);
#else
- OUString lib(RTL_CONSTASCII_USTRINGPARAM("index_data" SAL_DLLEXTENSION));
+ OUString lib("index_data" SAL_DLLEXTENSION);
#endif
hModule = osl_loadModuleRelative(
&thisModule, lib.pData, SAL_LOADMODULE_DEFAULT );
@@ -95,9 +95,9 @@ IndexEntrySupplier_asian::getIndexCharacter( const OUString& rIndexEntry,
sal_uInt16** (*func)(sal_Int16*)=NULL;
#ifndef DISABLE_DYNLOADING
if (hModule) {
- OUString get(RTL_CONSTASCII_USTRINGPARAM("get_indexdata_"));
+ OUString get("get_indexdata_");
if ( rLocale.Language == "zh" && OUString( "TW HK MO" ).indexOf(rLocale.Country) >= 0 )
- func=(sal_uInt16** (*)(sal_Int16*))osl_getFunctionSymbol(hModule, (get+rLocale.Language+OUString(RTL_CONSTASCII_USTRINGPARAM("_TW_"))+rAlgorithm).pData);
+ func=(sal_uInt16** (*)(sal_Int16*))osl_getFunctionSymbol(hModule, (get+rLocale.Language+OUString("_TW_")+rAlgorithm).pData);
if (!func)
func=(sal_uInt16** (*)(sal_Int16*))osl_getFunctionSymbol(hModule, (get+rLocale.Language+OUString('_')+rAlgorithm).pData);
}
@@ -173,7 +173,7 @@ IndexEntrySupplier_asian::getPhoneticCandidate( const OUString& rIndexEntry,
if (hModule) {
const sal_Char *func_name=NULL;
if ( rLocale.Language == "zh" )
- func_name=(OUString(RTL_CONSTASCII_USTRINGPARAM("TW HK MO")).indexOf(rLocale.Country) >= 0) ? "get_zh_zhuyin" : "get_zh_pinyin";
+ func_name=(OUString("TW HK MO").indexOf(rLocale.Country) >= 0) ? "get_zh_zhuyin" : "get_zh_pinyin";
else if ( rLocale.Language == "ko" )
func_name="get_ko_phonetic";
if (func_name)
@@ -181,7 +181,7 @@ IndexEntrySupplier_asian::getPhoneticCandidate( const OUString& rIndexEntry,
}
#else
if ( rLocale.Language == "zh" )
- func = (OUString(RTL_CONSTASCII_USTRINGPARAM("TW HK MO")).indexOf(rLocale.Country) >= 0) ? get_zh_zhuyin : get_zh_pinyin;
+ func = (OUString("TW HK MO").indexOf(rLocale.Country) >= 0) ? get_zh_zhuyin : get_zh_pinyin;
else if ( rLocale.Language == "ko" )
func = get_ko_phonetic;
diff --git a/i18npool/source/indexentry/indexentrysupplier_default.cxx b/i18npool/source/indexentry/indexentrysupplier_default.cxx
index 7b054e3..3fb842a 100644
--- a/i18npool/source/indexentry/indexentrysupplier_default.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_default.cxx
@@ -168,7 +168,7 @@ OUString Index::getIndexDescription(const OUString& rIndexEntry)
return OUString(&indexChar, 1);
}
-#define LOCALE_EN lang::Locale(OUString(RTL_CONSTASCII_USTRINGPARAM("en")), OUString(), OUString())
+#define LOCALE_EN lang::Locale(OUString("en"), OUString(), OUString())
void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm) throw (RuntimeException)
{
diff --git a/i18npool/source/inputchecker/inputsequencechecker.cxx b/i18npool/source/inputchecker/inputsequencechecker.cxx
index 4e70166..120516c 100644
--- a/i18npool/source/inputchecker/inputsequencechecker.cxx
+++ b/i18npool/source/inputchecker/inputsequencechecker.cxx
@@ -127,7 +127,7 @@ InputSequenceCheckerImpl::getInputSequenceChecker(sal_Char* rLanguage) throw (Ru
}
Reference < uno::XInterface > xI = xMSF->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.InputSequenceChecker_")) +
+ OUString("com.sun.star.i18n.InputSequenceChecker_") +
OUString::createFromAscii(rLanguage));
if ( xI.is() ) {
diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx
index af8e936..2590e7e 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -711,13 +711,13 @@ void LCFormatNode::generateCode (const OFileWriter &of) const
OUString aKey( aUsage + OUString( sal_Unicode(',')) + aType);
if (!aDefaultsSet.insert( aKey).second)
{
- OUString aStr( RTL_CONSTASCII_USTRINGPARAM( "Duplicated default for usage=\""));
+ OUString aStr( "Duplicated default for usage=\"");
aStr += aUsage;
- aStr += OUString( RTL_CONSTASCII_USTRINGPARAM( "\" type=\""));
+ aStr += OUString( "\" type=\"");
aStr += aType;
- aStr += OUString( RTL_CONSTASCII_USTRINGPARAM( "\": formatindex=\""));
+ aStr += OUString( "\": formatindex=\"");
aStr += aFormatIndex;
- aStr += OUString( RTL_CONSTASCII_USTRINGPARAM( "\"."));
+ aStr += OUString( "\".");
incError( aStr);
}
}
@@ -786,10 +786,10 @@ void LCFormatNode::generateCode (const OFileWriter &of) const
if (strcmp( of.getLocale(), "en_US") != 0)
{
OUString aCode( n->getValue());
- OUString aPar1( RTL_CONSTASCII_USTRINGPARAM( "0)" ));
- OUString aPar2( RTL_CONSTASCII_USTRINGPARAM( "-)" ));
- OUString aPar3( RTL_CONSTASCII_USTRINGPARAM( " )" ));
- OUString aPar4( RTL_CONSTASCII_USTRINGPARAM( "])" ));
+ OUString aPar1( "0)");
+ OUString aPar2( "-)" );
+ OUString aPar3( " )" );
+ OUString aPar4( "])" );
if (aCode.indexOf( aPar1 ) > 0 || aCode.indexOf( aPar2 ) > 0 ||
aCode.indexOf( aPar3 ) > 0 || aCode.indexOf( aPar4 ) > 0)
fprintf( stderr, "Warning: FormatCode formatindex=\"%d\" for currency uses parentheses for negative amounts, which probably is not correct for locales not based on en_US.\n", formatindex);
@@ -1586,7 +1586,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
}
}
if (!ref_name.isEmpty() && daysNode == NULL) {
- of.writeParameter("dayRef", OUString(RTL_CONSTASCII_USTRINGPARAM("ref")), i);
+ of.writeParameter("dayRef", OUString("ref"), i);
of.writeParameter("dayRefName", ref_name, i);
nbOfDays[i] = 0;
} else {
@@ -1618,7 +1618,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
}
}
if (!ref_name.isEmpty() && monthsNode == NULL) {
- of.writeParameter("monthRef", OUString(RTL_CONSTASCII_USTRINGPARAM("ref")), i);
+ of.writeParameter("monthRef", OUString("ref"), i);
of.writeParameter("monthRefName", ref_name, i);
nbOfMonths[i] = 0;
} else {
@@ -1653,7 +1653,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
}
}
if (!ref_name.isEmpty() && genitiveMonthsNode == NULL) {
- of.writeParameter("genitiveMonthRef", OUString(RTL_CONSTASCII_USTRINGPARAM("ref")), i);
+ of.writeParameter("genitiveMonthRef", OUString("ref"), i);
of.writeParameter("genitiveMonthRefName", ref_name, i);
nbOfGenitiveMonths[i] = 0;
} else {
@@ -1689,7 +1689,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
}
}
if (!ref_name.isEmpty() && partitiveMonthsNode == NULL) {
- of.writeParameter("partitiveMonthRef", OUString(RTL_CONSTASCII_USTRINGPARAM("ref")), i);
+ of.writeParameter("partitiveMonthRef", OUString("ref"), i);
of.writeParameter("partitiveMonthRefName", ref_name, i);
nbOfPartitiveMonths[i] = 0;
} else {
@@ -1721,7 +1721,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
}
}
if (!ref_name.isEmpty() && erasNode == NULL) {
- of.writeParameter("eraRef", OUString(RTL_CONSTASCII_USTRINGPARAM("ref")), i);
+ of.writeParameter("eraRef", OUString("ref"), i);
of.writeParameter("eraRefName", ref_name, i);
nbOfEras[i] = 0;
} else {
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index e23270e..decd33f 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -581,7 +581,7 @@ Sequence< CalendarItem2 > &LocaleData::getCalendarItemByName(const OUString& nam
// Referred locale not found, return name for en_US locale.
if (index == cals.getLength()) {
cals = getAllCalendars2(
- Locale(OUString(RTL_CONSTASCII_USTRINGPARAM("en")), OUString(RTL_CONSTASCII_USTRINGPARAM("US")), OUString()));
+ Locale(OUString("en"), OUString("US"), OUString()));
if (cals.getLength() > 0)
ref_cal = cals[0];
else
@@ -1053,7 +1053,7 @@ OUString SAL_CALL
LocaleData::getIndexKeysByAlgorithm( const Locale& rLocale, const OUString& algorithm ) throw(RuntimeException)
{
sal_Unicode **indexArray = getIndexArrayForAlgorithm(rLocale, algorithm);
- return indexArray ? OUString(RTL_CONSTASCII_USTRINGPARAM("0-9"))+OUString(indexArray[2]) : OUString();
+ return indexArray ? OUString("0-9")+OUString(indexArray[2]) : OUString();
}
OUString SAL_CALL
@@ -1621,7 +1621,7 @@ sal_Bool OutlineNumbering::hasElements( ) throw(RuntimeException)
OUString SAL_CALL
LocaleData::getImplementationName() throw( RuntimeException )
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM(clocaledata));
+ return OUString(clocaledata);
}
sal_Bool SAL_CALL
@@ -1635,7 +1635,7 @@ Sequence< OUString > SAL_CALL
LocaleData::getSupportedServiceNames() throw( RuntimeException )
{
Sequence< OUString > aRet(1);
- aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(clocaledata));
+ aRet[0] = OUString(clocaledata);
return aRet;
}
diff --git a/i18npool/source/localedata/saxparser.cxx b/i18npool/source/localedata/saxparser.cxx
index 2a5fd1e..deb30f3 100644
--- a/i18npool/source/localedata/saxparser.cxx
+++ b/i18npool/source/localedata/saxparser.cxx
@@ -163,7 +163,7 @@ public: // Error handler
++nError;
printf( "Error !\n" );
throw SAXException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("error from error handler")) ,
+ OUString( "error from error handler") ,
Reference < XInterface >() ,
aSAXParseException );
}
@@ -332,7 +332,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
// read xml from a file and count elements
//--------------------------------
Reference< XInterface > x = xSMgr->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) );
+ OUString("com.sun.star.xml.sax.Parser") );
int nError = 0;
if( x.is() )
{
diff --git a/i18npool/source/numberformatcode/numberformatcode.cxx b/i18npool/source/numberformatcode/numberformatcode.cxx
index b8972e3..e6fbed0 100644
--- a/i18npool/source/numberformatcode/numberformatcode.cxx
+++ b/i18npool/source/numberformatcode/numberformatcode.cxx
@@ -189,11 +189,11 @@ NumberFormatCodeMapper::mapElementTypeShortToString(sal_Int16 formatType)
switch ( formatType )
{
case com::sun::star::i18n::KNumberFormatType::SHORT :
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "short" ) );
+ return ::rtl::OUString( "short" );
case com::sun::star::i18n::KNumberFormatType::MEDIUM :
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "medium" ) );
+ return ::rtl::OUString( "medium" );
case com::sun::star::i18n::KNumberFormatType::LONG :
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "long" ) );
+ return ::rtl::OUString( "long" );
}
return ::rtl::OUString();
}
@@ -217,21 +217,21 @@ NumberFormatCodeMapper::mapElementUsageShortToString(sal_Int16 formatUsage)
switch ( formatUsage )
{
case com::sun::star::i18n::KNumberFormatUsage::DATE :
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DATE" ) );
+ return ::rtl::OUString( "DATE" );
case com::sun::star::i18n::KNumberFormatUsage::TIME :
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TIME" ) );
+ return ::rtl::OUString( "TIME" );
case com::sun::star::i18n::KNumberFormatUsage::DATE_TIME :
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DATE_TIME" ) );
+ return ::rtl::OUString( "DATE_TIME" );
case com::sun::star::i18n::KNumberFormatUsage::FIXED_NUMBER :
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FIXED_NUMBER" ) );
+ return ::rtl::OUString( "FIXED_NUMBER" );
case com::sun::star::i18n::KNumberFormatUsage::FRACTION_NUMBER :
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FRACTION_NUMBER" ) );
+ return ::rtl::OUString( "FRACTION_NUMBER" );
case com::sun::star::i18n::KNumberFormatUsage::PERCENT_NUMBER :
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PERCENT_NUMBER" ) );
+ return ::rtl::OUString( "PERCENT_NUMBER" );
case com::sun::star::i18n::KNumberFormatUsage::CURRENCY :
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CURRENCY" ) );
+ return ::rtl::OUString( "CURRENCY" );
case com::sun::star::i18n::KNumberFormatUsage::SCIENTIFIC_NUMBER :
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SCIENTIFIC_NUMBER" ) );
+ return ::rtl::OUString( "SCIENTIFIC_NUMBER" );
}
return ::rtl::OUString();
}
@@ -269,7 +269,7 @@ NumberFormatCodeMapper::createLocaleDataObject() {
::com::sun::star::uno::Reference < ::com::sun::star::uno::XInterface >
xI = xMSF->createInstance(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.LocaleData" ) ));
+ ::rtl::OUString( "com.sun.star.i18n.LocaleData" ));
if ( xI.is() ) {
::com::sun::star::uno::Any x = xI->queryInterface( ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XLocaleData >*)0) );
@@ -281,7 +281,7 @@ NumberFormatCodeMapper::createLocaleDataObject() {
NumberFormatCodeMapper::getImplementationName(void)
throw( ::com::sun::star::uno::RuntimeException )
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.NumberFormatCodeMapper"));
+ return ::rtl::OUString("com.sun.star.i18n.NumberFormatCodeMapper");
}
const sal_Char cNumFormat[] = "com.sun.star.i18n.NumberFormatMapper";
diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx
index 18c93a0..8c2d554 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.cxx
@@ -112,8 +112,8 @@ void TextSearch::setOptions( const SearchOptions& rOptions ) throw( RuntimeExcep
if( !xTranslit.is() )
{
Reference < XInterface > xI = xMSF->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.i18n.Transliteration")));
+ OUString(
+ "com.sun.star.i18n.Transliteration"));
if ( xI.is() )
xI->queryInterface( ::getCppuType(
(const Reference< XExtendedTransliteration >*)0))
@@ -134,8 +134,8 @@ void TextSearch::setOptions( const SearchOptions& rOptions ) throw( RuntimeExcep
if( !xTranslit2.is() )
{
Reference < XInterface > xI = xMSF->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.i18n.Transliteration")));
+ OUString(
+ "com.sun.star.i18n.Transliteration"));
if ( xI.is() )
xI->queryInterface( ::getCppuType(
(const Reference< XExtendedTransliteration >*)0))
@@ -151,7 +151,7 @@ void TextSearch::setOptions( const SearchOptions& rOptions ) throw( RuntimeExcep
if ( !xBreak.is() )
{
Reference < XInterface > xI = xMSF->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator")));
+ OUString("com.sun.star.i18n.BreakIterator"));
if( xI.is() )
xI->queryInterface( ::getCppuType(
(const Reference< XBreakIterator >*)0))
@@ -411,7 +411,7 @@ bool TextSearch::IsDelimiter( const OUString& rStr, sal_Int32 nPos ) const
if ( !xCharClass.is() )
{
Reference < XInterface > xI = xMSF->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.CharacterClassification")));
+ OUString("com.sun.star.i18n.CharacterClassification"));
if( xI.is() )
xI->queryInterface( ::getCppuType(
(const Reference< XCharacterClassification >*)0))
diff --git a/i18npool/source/textconversion/textconversionImpl.cxx b/i18npool/source/textconversion/textconversionImpl.cxx
index 484f9c6..76cd37d 100644
--- a/i18npool/source/textconversion/textconversionImpl.cxx
+++ b/i18npool/source/textconversion/textconversionImpl.cxx
@@ -98,17 +98,17 @@ TextConversionImpl::getLocaleSpecificTextConversion(const Locale& rLocale) throw
Reference < XInterface > xI;
xI = xMSF->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.TextConversion_")) + aLocale.Language);
+ OUString("com.sun.star.i18n.TextConversion_") + aLocale.Language);
if ( ! xI.is() )
xI = xMSF->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.TextConversion_")) + aLocale.Language +
- OUString(RTL_CONSTASCII_USTRINGPARAM("_")) + aLocale.Country);
+ OUString("com.sun.star.i18n.TextConversion_") + aLocale.Language +
+ OUString("_") + aLocale.Country);
if ( ! xI.is() )
xI = xMSF->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.TextConversion_")) + aLocale.Language +
- OUString(RTL_CONSTASCII_USTRINGPARAM("_")) + aLocale.Country +
- OUString(RTL_CONSTASCII_USTRINGPARAM("_")) + aLocale.Variant);
+ OUString("com.sun.star.i18n.TextConversion_") + aLocale.Language +
+ OUString("_") + aLocale.Country +
+ OUString("_") + aLocale.Variant);
if (xI.is())
xI->queryInterface( getCppuType((const Reference< XTextConversion>*)0) ) >>= xTC;
diff --git a/i18npool/source/textconversion/textconversion_ko.cxx b/i18npool/source/textconversion/textconversion_ko.cxx
index 2d12354..a543ec9 100644
--- a/i18npool/source/textconversion/textconversion_ko.cxx
+++ b/i18npool/source/textconversion/textconversion_ko.cxx
@@ -54,13 +54,13 @@ TextConversion_ko::TextConversion_ko( const Reference < XMultiServiceFactory >&
Reference < XInterface > xI;
xI = xMSF->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.ConversionDictionary_ko")));
+ OUString("com.sun.star.i18n.ConversionDictionary_ko"));
if ( xI.is() )
xI->queryInterface( getCppuType((const Reference< XConversionDictionary>*)0) ) >>= xCD;
xI = xMSF->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.linguistic2.ConversionDictionaryList")));
+ OUString("com.sun.star.linguistic2.ConversionDictionaryList"));
if ( xI.is() )
xI->queryInterface( getCppuType((const Reference< XConversionDictionaryList>*)0) ) >>= xCDL;
@@ -69,8 +69,8 @@ TextConversion_ko::TextConversion_ko( const Reference < XMultiServiceFactory >&
// get maximum length of word in dictionary
if (xCDL.is()) {
- Locale loc(OUString(RTL_CONSTASCII_USTRINGPARAM("ko")),
- OUString(RTL_CONSTASCII_USTRINGPARAM("KR")),
+ Locale loc(OUString("ko"),
+ OUString("KR"),
OUString());
maxLeftLength = xCDL->queryMaxCharCount(loc,
ConversionDictionaryType::HANGUL_HANJA,
diff --git a/i18npool/source/textconversion/textconversion_zh.cxx b/i18npool/source/textconversion/textconversion_zh.cxx
index 0438558..ea6c6f3 100644
--- a/i18npool/source/textconversion/textconversion_zh.cxx
+++ b/i18npool/source/textconversion/textconversion_zh.cxx
@@ -48,7 +48,7 @@ TextConversion_zh::TextConversion_zh( const Reference < XMultiServiceFactory >&
{
Reference < XInterface > xI;
xI = xMSF->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.linguistic2.ConversionDictionaryList")));
+ OUString("com.sun.star.linguistic2.ConversionDictionaryList"));
if ( xI.is() )
xI->queryInterface( getCppuType((const Reference< XConversionDictionaryList>*)0) ) >>= xCDL;
diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx
index 009f6e3..ac2ccbd 100644
--- a/i18npool/source/transliteration/transliterationImpl.cxx
+++ b/i18npool/source/transliteration/transliterationImpl.cxx
@@ -153,7 +153,7 @@ TransliterationImpl::TransliterationImpl(const Reference <XMultiServiceFactory>&
if ( xMSF.is() )
{
Reference < XInterface > xI=
- xMSF->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.LocaleData")));
+ xMSF->createInstance(OUString("com.sun.star.i18n.LocaleData"));
if ( xI.is() ) {
Any x = xI->queryInterface( ::getCppuType( (const uno::Reference< i18n::XLocaleData >*)0) );
x >>= localedata;
@@ -175,7 +175,7 @@ TransliterationImpl::getName() throw(RuntimeException)
if (numCascade == 1 && bodyCascade[0].is())
return bodyCascade[0]->getName();
if (numCascade < 1)
- return ( OUString(RTL_CONSTASCII_USTRINGPARAM("Not Loaded")));
+ return ( OUString("Not Loaded"));
throw ERROR;
}
@@ -616,7 +616,7 @@ sal_Bool SAL_CALL
TransliterationImpl::loadModuleByName( const OUString& implName,
Reference<XExtendedTransliteration>& body, const Locale& rLocale) throw(RuntimeException)
{
- OUString cname = OUString(RTL_CONSTASCII_USTRINGPARAM(TRLT_IMPLNAME_PREFIX)) + implName;
+ OUString cname = OUString(TRLT_IMPLNAME_PREFIX) + implName;
loadBody(cname, body);
if (body.is()) {
body->loadModule((TransliterationModules)0, rLocale); // toUpper/toLoad need rLocale
@@ -627,7 +627,7 @@ TransliterationImpl::loadModuleByName( const OUString& implName,
if (i == 0) // current module is caseignore
body->loadModule(TMlist[0].tm, rLocale); // caseingore need to setup module name
if (! caseignore.is()) {
- OUString bname = OUString(RTL_CONSTASCII_USTRINGPARAM(TRLT_IMPLNAME_PREFIX)) +
+ OUString bname = OUString(TRLT_IMPLNAME_PREFIX) +
OUString::createFromAscii(TMlist[0].implName);
loadBody(bname, caseignore);
}
More information about the Libreoffice-commits
mailing list