From 39d45390f4fab1e9e85f211d74ed2c08fda5b652 Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Tue, 19 Mar 2013 11:39:07 +0100 Subject: removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings declarations s/(OUString\s+[a-zA-Z_][A-Za-z0-9_]*\s*)\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/$1\($2\)/gms Change-Id: Iad20f242c80c4bdc69df17e2d7a69d58ea53654b Reviewed-on: https://gerrit.libreoffice.org/2835 Reviewed-by: Thomas Arnhold Tested-by: Thomas Arnhold --- stoc/source/inspect/introspection.cxx | 2 +- stoc/source/javaloader/javaloader.cxx | 2 +- stoc/source/javavm/javavm.cxx | 23 +++++++++++----------- .../javavm/jvm_interaction/interactionhandler.cxx | 2 +- stoc/test/javavm/testjavavm.cxx | 8 ++++---- 5 files changed, 18 insertions(+), 19 deletions(-) (limited to 'stoc') diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx index 1fc00707d356..24cd0cc614a0 100644 --- a/stoc/source/inspect/introspection.cxx +++ b/stoc/source/inspect/introspection.cxx @@ -2519,7 +2519,7 @@ rtl::Reference< IntrospectionAccessStatic_Impl > ImplIntrospection::implInspect( sal_Int32 nNameLen = aMethName2.getLength(); sal_Int32 nCopyLen2 = (nNameLen < 6) ? nNameLen : 6; ::rtl::OUString aStartStr2 = aMethName2.copy( 0, nCopyLen2 ); - ::rtl::OUString aRemoveStr( RTL_CONSTASCII_USTRINGPARAM("remove" ) ); + ::rtl::OUString aRemoveStr("remove" ); // ACHTUNG: Wegen SDL-Bug NICHT != bei ::rtl::OUString verwenden !!! if( !( aStartStr2 == aRemoveStr ) ) continue; diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx index 352782ede2e8..d97278d9c684 100644 --- a/stoc/source/javaloader/javaloader.cxx +++ b/stoc/source/javaloader/javaloader.cxx @@ -219,7 +219,7 @@ const css::uno::Reference & JavaComponentLoader::getJavaL css::uno::Reference()); // map the java JavaLoader to this environment - OUString sJava(RTL_CONSTASCII_USTRINGPARAM("java")); + OUString sJava("java"); uno_getEnvironment(&pJava_environment, sJava.pData, xVirtualMachine.get()); if(!pJava_environment) diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index 102605c072f1..86c32c170b12 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -216,8 +216,7 @@ rtl::OUString serviceGetImplementationName() css::uno::Sequence< rtl::OUString > serviceGetSupportedServiceNames() { - rtl::OUString aServiceName( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.java.JavaVirtualMachine")); + rtl::OUString aServiceName("com.sun.star.java.JavaVirtualMachine"); return css::uno::Sequence< rtl::OUString >(&aServiceName, 1); } @@ -424,14 +423,14 @@ void getDefaultLocaleFromConfig( country = locale->getStringValue().copy(index + 1); if(!language.isEmpty()) { - rtl::OUString prop(RTL_CONSTASCII_USTRINGPARAM("user.language=")); + rtl::OUString prop("user.language="); prop += language; pjvm->pushProp(prop); } if(!country.isEmpty()) { - rtl::OUString prop(RTL_CONSTASCII_USTRINGPARAM("user.country=")); + rtl::OUString prop("user.country="); prop += country; pjvm->pushProp(prop); @@ -486,7 +485,7 @@ void getJavaPropsFromSafetySettings( case 3: sVal= rtl::OUString("none"); break; } - rtl::OUString sProperty( RTL_CONSTASCII_USTRINGPARAM("appletviewer.security.mode=")); + rtl::OUString sProperty("appletviewer.security.mode="); sProperty= sProperty + sVal; pjvm->pushProp(sProperty); } @@ -495,7 +494,7 @@ void getJavaPropsFromSafetySettings( if( key_CheckSecurity.is()) { sal_Bool val= (sal_Bool) key_CheckSecurity->getLongValue(); - rtl::OUString sProperty(RTL_CONSTASCII_USTRINGPARAM("stardiv.security.disableSecurity=")); + rtl::OUString sProperty("stardiv.security.disableSecurity="); if( val) sProperty= sProperty + rtl::OUString("false"); else @@ -1500,12 +1499,12 @@ void JavaVirtualMachine::setINetSettingsInVM(bool set_reset) JNIEnv * pJNIEnv = aAttachGuard.getEnvironment(); // The Java Properties - rtl::OUString sFtpProxyHost(RTL_CONSTASCII_USTRINGPARAM("ftp.proxyHost") ); - rtl::OUString sFtpProxyPort(RTL_CONSTASCII_USTRINGPARAM("ftp.proxyPort") ); - rtl::OUString sFtpNonProxyHosts (RTL_CONSTASCII_USTRINGPARAM("ftp.nonProxyHosts")); - rtl::OUString sHttpProxyHost(RTL_CONSTASCII_USTRINGPARAM("http.proxyHost") ); - rtl::OUString sHttpProxyPort(RTL_CONSTASCII_USTRINGPARAM("http.proxyPort") ); - rtl::OUString sHttpNonProxyHosts(RTL_CONSTASCII_USTRINGPARAM("http.nonProxyHosts")); + rtl::OUString sFtpProxyHost("ftp.proxyHost"); + rtl::OUString sFtpProxyPort("ftp.proxyPort"); + rtl::OUString sFtpNonProxyHosts ("ftp.nonProxyHosts"); + rtl::OUString sHttpProxyHost("http.proxyHost"); + rtl::OUString sHttpProxyPort("http.proxyPort"); + rtl::OUString sHttpNonProxyHosts("http.nonProxyHosts"); // creat Java Properties as JNI strings jstring jsFtpProxyHost= pJNIEnv->NewString( sFtpProxyHost.getStr(), sFtpProxyHost.getLength()); diff --git a/stoc/test/javavm/jvm_interaction/interactionhandler.cxx b/stoc/test/javavm/jvm_interaction/interactionhandler.cxx index 405df9342e56..d95eb666ffcf 100644 --- a/stoc/test/javavm/jvm_interaction/interactionhandler.cxx +++ b/stoc/test/javavm/jvm_interaction/interactionhandler.cxx @@ -125,7 +125,7 @@ sal_Bool test1(const Reference< XMultiServiceFactory > & xMgr ) sal_Bool retVal= sal_True; setCurrentContext( Reference( static_cast(new Context()), UNO_QUERY)); - OUString sVMService( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.java.JavaVirtualMachine")); + OUString sVMService("com.sun.star.java.JavaVirtualMachine"); Reference xXInt= xMgr->createInstance(sVMService); if( ! xXInt.is()) return sal_False; diff --git a/stoc/test/javavm/testjavavm.cxx b/stoc/test/javavm/testjavavm.cxx index 8e2f769582da..97418fa1df42 100644 --- a/stoc/test/javavm/testjavavm.cxx +++ b/stoc/test/javavm/testjavavm.cxx @@ -50,7 +50,7 @@ using ::rtl::OString; sal_Bool testJavaVM(const Reference< XMultiServiceFactory > & xMgr ) { - OUString sVMService( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.java.JavaVirtualMachine")); + OUString sVMService("com.sun.star.java.JavaVirtualMachine"); Reference xXInt= xMgr->createInstance(sVMService); if( ! xXInt.is()) return sal_False; @@ -126,14 +126,14 @@ SAL_IMPLEMENT_MAIN() sal_Bool bSucc = sal_False; try { - OUString sImplReg(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.registry.ImplementationRegistration")); + OUString sImplReg( + "com.sun.star.registry.ImplementationRegistration"); Reference xImplReg( xMgr->createInstance( sImplReg ), UNO_QUERY ); OSL_ENSURE( xImplReg.is(), "### no impl reg!" ); - OUString sLibLoader( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")); + OUString sLibLoader("com.sun.star.loader.SharedLibrary"); OUString sJenLib( RTL_CONSTASCII_USTRINGPARAM( "javavm.uno" SAL_DLLEXTENSION ) ); xImplReg->registerImplementation( -- cgit