Kaydet (Commit) 585807a7 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

i18npool: Use appropriate OUString functions on string constants

Change-Id: I6f2fabd9248b1b385439ff5c074342029fb660e0
üst 464ff17e
......@@ -457,7 +457,7 @@ void TestBreakIterator::testWordBoundaries()
break;
case 1:
aLocale.Language = "grc";
aLocale.Country = "";
aLocale.Country.clear();
break;
default:
CPPUNIT_ASSERT(false);
......
......@@ -540,7 +540,7 @@ bool SAL_CALL BreakIteratorImpl::createLocaleSpecificBreakIterator(const OUStrin
}
Reference < uno::XInterface > xI = m_xContext->getServiceManager()->createInstanceWithContext(
OUString("com.sun.star.i18n.BreakIterator_") + aLocaleName, m_xContext);
"com.sun.star.i18n.BreakIterator_" + aLocaleName, m_xContext);
if ( xI.is() ) {
xBI.set(xI, UNO_QUERY);
......@@ -615,7 +615,7 @@ Sequence< OUString > SAL_CALL
BreakIteratorImpl::getSupportedServiceNames(void) throw( RuntimeException, std::exception )
{
Sequence< OUString > aRet(1);
aRet[0] = OUString("com.sun.star.i18n.BreakIterator");
aRet[0] = "com.sun.star.i18n.BreakIterator";
return aRet;
}
......
......@@ -70,7 +70,7 @@ CalendarImpl::loadCalendar(const OUString& uniqueID, const Locale& rLocale ) thr
if (i >= sal::static_int_cast<sal_Int32>(lookupTable.size())) {
Reference < XInterface > xI = m_xContext->getServiceManager()->createInstanceWithContext(
OUString("com.sun.star.i18n.Calendar_") + uniqueID, m_xContext);
"com.sun.star.i18n.Calendar_" + uniqueID, m_xContext);
if ( ! xI.is() ) {
// check if the calendar is defined in localedata, load gregorian calendar service.
......
......@@ -273,7 +273,7 @@ sal_Bool SAL_CALL cclass_Unicode::supportsService(const OUString& rServiceName)
Sequence< OUString > SAL_CALL cclass_Unicode::getSupportedServiceNames() throw( RuntimeException, std::exception )
{
Sequence< OUString > aRet(1);
aRet[0] = OUString("com.sun.star.i18n.CharacterClassification_Unicode");
aRet[0] = "com.sun.star.i18n.CharacterClassification_Unicode";
return aRet;
}
......
......@@ -139,7 +139,7 @@ bool SAL_CALL CharacterClassificationImpl::createLocaleSpecificCharacterClassifi
}
Reference < XInterface > xI = m_xContext->getServiceManager()->createInstanceWithContext(
OUString("com.sun.star.i18n.CharacterClassification_") + serviceName, m_xContext);
"com.sun.star.i18n.CharacterClassification_" + serviceName, m_xContext);
Reference < XCharacterClassification > xCI;
if ( xI.is() ) {
......@@ -209,7 +209,7 @@ Sequence< OUString > SAL_CALL
CharacterClassificationImpl::getSupportedServiceNames(void) throw( RuntimeException, std::exception )
{
Sequence< OUString > aRet(1);
aRet[0] = OUString("com.sun.star.i18n.CharacterClassification");
aRet[0] = "com.sun.star.i18n.CharacterClassification";
return aRet;
}
......
......@@ -78,7 +78,7 @@ UnoScriptTypeDetector::supportsService(const OUString& ServiceName) throw( ::com
UnoScriptTypeDetector::getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception )
{
::com::sun::star::uno::Sequence< OUString > aRet(1);
aRet[0] = OUString("com.sun.star.i18n.ScriptTypeDetector");
aRet[0] = "com.sun.star.i18n.ScriptTypeDetector";
return aRet;
}
......
......@@ -227,7 +227,7 @@ Sequence< OUString > SAL_CALL
CollatorImpl::getSupportedServiceNames() throw( RuntimeException, std::exception )
{
Sequence< OUString > aRet(1);
aRet[0] = OUString("com.sun.star.i18n.Collator");
aRet[0] = "com.sun.star.i18n.Collator";
return aRet;
}
......
......@@ -1061,7 +1061,7 @@ Sequence< OUString > DefaultNumberingProvider::getSupportedServiceNames(void)
throw( RuntimeException, std::exception )
{
Sequence< OUString > aRet(1);
aRet[0] = OUString("com.sun.star.text.DefaultNumberingProvider");
aRet[0] = "com.sun.star.text.DefaultNumberingProvider";
return aRet;
}
......
......@@ -100,7 +100,7 @@ throw (RuntimeException, std::exception)
bool SAL_CALL IndexEntrySupplier::createLocaleSpecificIndexEntrySupplier(const OUString& name) throw( RuntimeException )
{
Reference < XInterface > xI = m_xContext->getServiceManager()->createInstanceWithContext(
OUString("com.sun.star.i18n.IndexEntrySupplier_") + name, m_xContext);
"com.sun.star.i18n.IndexEntrySupplier_" + name, m_xContext);
if ( xI.is() ) {
xIES.set( xI, UNO_QUERY );
......
......@@ -118,7 +118,7 @@ InputSequenceCheckerImpl::getInputSequenceChecker(sal_Char* rLanguage) throw (Ru
}
Reference < uno::XInterface > xI = m_xContext->getServiceManager()->createInstanceWithContext(
OUString("com.sun.star.i18n.InputSequenceChecker_") +
"com.sun.star.i18n.InputSequenceChecker_" +
OUString::createFromAscii(rLanguage),
m_xContext);
......
......@@ -1077,7 +1077,7 @@ OUString SAL_CALL
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();
return indexArray ? "0-9"+OUString(indexArray[2]) : OUString();
}
OUString SAL_CALL
......
......@@ -127,7 +127,7 @@ Sequence< OUString > SAL_CALL
TextConversionImpl::getSupportedServiceNames() throw( RuntimeException, std::exception )
{
Sequence< OUString > aRet(1);
aRet[0] = OUString("com.sun.star.i18n.TextConversion");
aRet[0] = "com.sun.star.i18n.TextConversion";
return aRet;
}
......
......@@ -611,7 +611,7 @@ bool SAL_CALL
TransliterationImpl::loadModuleByName( const OUString& implName,
Reference<XExtendedTransliteration>& body, const Locale& rLocale) throw(RuntimeException)
{
OUString cname = OUString(TRLT_IMPLNAME_PREFIX) + implName;
OUString cname = TRLT_IMPLNAME_PREFIX + implName;
loadBody(cname, body);
if (body.is()) {
body->loadModule((TransliterationModules)0, rLocale); // toUpper/toLoad need rLocale
......@@ -622,7 +622,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(TRLT_IMPLNAME_PREFIX) +
OUString bname = TRLT_IMPLNAME_PREFIX +
OUString::createFromAscii(TMlist[0].implName);
loadBody(bname, caseignore);
}
......@@ -652,7 +652,7 @@ Sequence< OUString > SAL_CALL
TransliterationImpl::getSupportedServiceNames(void) throw( RuntimeException, std::exception )
{
Sequence< OUString > aRet(1);
aRet[0] = OUString("com.sun.star.i18n.Transliteration");
aRet[0] = "com.sun.star.i18n.Transliteration";
return aRet;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment