[Libreoffice-commits] .: i18npool/source
Gert Faller
gfaller at kemper.freedesktop.org
Thu Nov 25 12:03:03 PST 2010
i18npool/source/indexentry/indexentrysupplier_asian.cxx | 4 ++--
i18npool/source/localedata/saxparser.cxx | 3 +--
i18npool/source/search/textsearch.cxx | 8 ++++----
i18npool/source/textconversion/textconversion.cxx | 4 ++--
i18npool/source/transliteration/textToPronounce_zh.cxx | 4 ++--
i18npool/source/transliteration/transliterationImpl.cxx | 6 +++---
6 files changed, 14 insertions(+), 15 deletions(-)
New commits:
commit 96d63792628903cbb94cff70d71520e074cb382e
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Thu Nov 25 21:02:33 2010 +0100
RTL_CONSTASCII_USTRINGPARAM in libs-gui 16
diff --git a/i18npool/source/indexentry/indexentrysupplier_asian.cxx b/i18npool/source/indexentry/indexentrysupplier_asian.cxx
index 9c219a8..635510c 100644
--- a/i18npool/source/indexentry/indexentrysupplier_asian.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_asian.cxx
@@ -46,9 +46,9 @@ IndexEntrySupplier_asian::IndexEntrySupplier_asian(
{
implementationName = "com.sun.star.i18n.IndexEntrySupplier_asian";
#ifdef SAL_DLLPREFIX
- OUString lib=OUString::createFromAscii(SAL_DLLPREFIX"index_data"SAL_DLLEXTENSION);
+ OUString lib(RTL_CONSTASCII_USTRINGPARAM(SAL_DLLPREFIX"index_data"SAL_DLLEXTENSION));
#else
- OUString lib=OUString::createFromAscii("index_data"SAL_DLLEXTENSION);
+ OUString lib(RTL_CONSTASCII_USTRINGPARAM("index_data"SAL_DLLEXTENSION));
#endif
hModule = osl_loadModuleRelative(
&thisModule, lib.pData, SAL_LOADMODULE_DEFAULT );
diff --git a/i18npool/source/localedata/saxparser.cxx b/i18npool/source/localedata/saxparser.cxx
index 04279fb..a5353d6 100644
--- a/i18npool/source/localedata/saxparser.cxx
+++ b/i18npool/source/localedata/saxparser.cxx
@@ -366,8 +366,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
try
{
// Load dll for the tested component
- OUString aDllName =
- OUString::createFromAscii( "sax.uno" SAL_DLLEXTENSION );
+ OUString aDllName(RTL_CONSTASCII_USTRINGPARAM( "sax.uno" SAL_DLLEXTENSION ));
xReg->registerImplementation(
OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")),
aDllName,
diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx
index ce51c19..4b4f462 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.cxx
@@ -114,8 +114,8 @@ void TextSearch::setOptions( const SearchOptions& rOptions ) throw( RuntimeExcep
if( !xTranslit.is() )
{
Reference < XInterface > xI = xMSF->createInstance(
- OUString::createFromAscii(
- "com.sun.star.i18n.Transliteration"));
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.i18n.Transliteration")));
if ( xI.is() )
xI->queryInterface( ::getCppuType(
(const Reference< XExtendedTransliteration >*)0))
@@ -136,8 +136,8 @@ void TextSearch::setOptions( const SearchOptions& rOptions ) throw( RuntimeExcep
if( !xTranslit2.is() )
{
Reference < XInterface > xI = xMSF->createInstance(
- OUString::createFromAscii(
- "com.sun.star.i18n.Transliteration"));
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.i18n.Transliteration")));
if ( xI.is() )
xI->queryInterface( ::getCppuType(
(const Reference< XExtendedTransliteration >*)0))
diff --git a/i18npool/source/textconversion/textconversion.cxx b/i18npool/source/textconversion/textconversion.cxx
index aea9f55..34e4d90 100644
--- a/i18npool/source/textconversion/textconversion.cxx
+++ b/i18npool/source/textconversion/textconversion.cxx
@@ -42,9 +42,9 @@ extern "C" { static void SAL_CALL thisModule() {} }
TextConversion::TextConversion()
{
#ifdef SAL_DLLPREFIX
- OUString lib=OUString::createFromAscii(SAL_DLLPREFIX"textconv_dict"SAL_DLLEXTENSION);
+ OUString lib(RTL_CONSTASCII_USTRINGPARAM(SAL_DLLPREFIX"textconv_dict"SAL_DLLEXTENSION));
#else
- OUString lib=OUString::createFromAscii("textconv_dict"SAL_DLLEXTENSION);
+ OUString lib(RTL_CONSTASCII_USTRINGPARAM("textconv_dict"SAL_DLLEXTENSION));
#endif
hModule = osl_loadModuleRelative(
&thisModule, lib.pData, SAL_LOADMODULE_DEFAULT );
diff --git a/i18npool/source/transliteration/textToPronounce_zh.cxx b/i18npool/source/transliteration/textToPronounce_zh.cxx
index 3f68df5..c45a034 100644
--- a/i18npool/source/transliteration/textToPronounce_zh.cxx
+++ b/i18npool/source/transliteration/textToPronounce_zh.cxx
@@ -149,9 +149,9 @@ extern "C" { static void SAL_CALL thisModule() {} }
TextToPronounce_zh::TextToPronounce_zh(const sal_Char* func_name)
{
#ifdef SAL_DLLPREFIX
- OUString lib=OUString::createFromAscii(SAL_DLLPREFIX"index_data"SAL_DLLEXTENSION);
+ OUString lib(RTL_CONSTASCII_USTRINGPARAM(SAL_DLLPREFIX"index_data"SAL_DLLEXTENSION));
#else
- OUString lib=OUString::createFromAscii("index_data"SAL_DLLEXTENSION);
+ OUString lib(RTL_CONSTASCII_USTRINGPARAM("index_data"SAL_DLLEXTENSION));
#endif
hModule = osl_loadModuleRelative(
&thisModule, lib.pData, SAL_LOADMODULE_DEFAULT );
diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx
index ce24756..4293e58 100644
--- a/i18npool/source/transliteration/transliterationImpl.cxx
+++ b/i18npool/source/transliteration/transliterationImpl.cxx
@@ -604,7 +604,7 @@ void TransliterationImpl::loadBody( OUString &implName, Reference<XExtendedTrans
Reference< XContentEnumerationAccess > xEnumAccess( xSMgr, UNO_QUERY );
Reference< XEnumeration > xEnum(xEnumAccess->createContentEnumeration(
- OUString::createFromAscii(TRLT_SERVICELNAME_L10N)));
+ OUString(RTL_CONSTASCII_USTRINGPARAM(TRLT_SERVICELNAME_L10N))));
if (xEnum.is()) {
while (xEnum->hasMoreElements()) {
Any a = xEnum->nextElement();
@@ -634,7 +634,7 @@ sal_Bool SAL_CALL
TransliterationImpl::loadModuleByName( const OUString& implName,
Reference<XExtendedTransliteration>& body, const Locale& rLocale) throw(RuntimeException)
{
- OUString cname = OUString::createFromAscii(TRLT_IMPLNAME_PREFIX) + implName;
+ OUString cname = OUString(RTL_CONSTASCII_USTRINGPARAM(TRLT_IMPLNAME_PREFIX)) + implName;
loadBody(cname, body);
if (body.is()) {
body->loadModule((TransliterationModules)0, rLocale); // toUpper/toLoad need rLocale
@@ -645,7 +645,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::createFromAscii(TRLT_IMPLNAME_PREFIX) +
+ OUString bname = OUString(RTL_CONSTASCII_USTRINGPARAM(TRLT_IMPLNAME_PREFIX)) +
OUString::createFromAscii(TMlist[0].implName);
loadBody(bname, caseignore);
}
More information about the Libreoffice-commits
mailing list