mass removal of rtl:: prefixes for O(U)String*

Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).

Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09

4 files changed, 11 insertions, 16 deletions

diff --git a/javaunohelper/source/bootstrap.cxx b/javaunohelper/source/bootstrap.cxx
index 323cc8011eca..c47b332d9a71 100644
--- a/javaunohelper/source/bootstrap.cxx
+++ b/javaunohelper/source/bootstrap.cxx
@@ -41,13 +41,11 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using ::rtl::OString;
-using ::rtl::OUString;
 
 namespace javaunohelper
 {
 
-inline ::rtl::OUString jstring_to_oustring( jstring jstr, JNIEnv * jni_env )
+inline OUString jstring_to_oustring( jstring jstr, JNIEnv * jni_env )
 {
     OSL_ASSERT( sizeof (sal_Unicode) == sizeof (jchar) );
     jsize len = jni_env->GetStringLength( jstr );
@@ -58,7 +56,7 @@ inline ::rtl::OUString jstring_to_oustring( jstring jstr, JNIEnv * jni_env )
     ustr->refCount = 1;
     ustr->length = len;
     ustr->buffer[ len ] = '\0';
-    return ::rtl::OUString( ustr, SAL_NO_ACQUIRE );
+    return OUString( ustr, SAL_NO_ACQUIRE );
 }
 
 }
@@ -154,7 +152,7 @@ extern "C" SAL_JNI_EXPORT jobject JNICALL Java_com_sun_star_comp_helper_Bootstra
         jclass c = jni_env->FindClass( "com/sun/star/uno/RuntimeException" );
         if (0 != c)
         {
-            OString cstr( ::rtl::OUStringToOString(
+            OString cstr( OUStringToOString(
                               exc.Message, RTL_TEXTENCODING_JAVA_UTF8 ) );
             OSL_TRACE( __FILE__": forwarding RuntimeException: %s", cstr.getStr() );
             jni_env->ThrowNew( c, cstr.getStr() );
@@ -165,7 +163,7 @@ extern "C" SAL_JNI_EXPORT jobject JNICALL Java_com_sun_star_comp_helper_Bootstra
         jclass c = jni_env->FindClass( "com/sun/star/uno/Exception" );
         if (0 != c)
         {
-            OString cstr( ::rtl::OUStringToOString(
+            OString cstr( OUStringToOString(
                               exc.Message, RTL_TEXTENCODING_JAVA_UTF8 ) );
             OSL_TRACE( __FILE__": forwarding Exception: %s", cstr.getStr() );
             jni_env->ThrowNew( c, cstr.getStr() );
diff --git a/javaunohelper/source/javaunohelper.cxx b/javaunohelper/source/javaunohelper.cxx
index 02af62e67b3a..68bf90794597 100644
--- a/javaunohelper/source/javaunohelper.cxx
+++ b/javaunohelper/source/javaunohelper.cxx
@@ -40,8 +40,6 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using ::rtl::OString;
-using ::rtl::OUString;
 
 /*
  * Class:     com_sun_star_comp_helper_SharedLibraryLoader
@@ -64,7 +62,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo(
     (void) jRegKey;
     (void) loader;
 
-    fprintf(stderr, "Hmm, %s called for %s\n", __PRETTY_FUNCTION__, ::rtl::OUStringToOString(pJLibName, RTL_TEXTENCODING_JAVA_UTF8).getStr());
+    fprintf(stderr, "Hmm, %s called for %s\n", __PRETTY_FUNCTION__, OUStringToOString(pJLibName, RTL_TEXTENCODING_JAVA_UTF8).getStr());
 #else
     oslModule lib = osl_loadModule( aLibName.pData, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL );
     if (lib)
@@ -148,7 +146,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
     (void) jRegKey;
     (void) loader;
 
-    fprintf(stderr, "Hmm, %s called for %s\n", __PRETTY_FUNCTION__, ::rtl::OUStringToOString(pJLibName, RTL_TEXTENCODING_JAVA_UTF8).getStr());
+    fprintf(stderr, "Hmm, %s called for %s\n", __PRETTY_FUNCTION__, OUStringToOString(pJLibName, RTL_TEXTENCODING_JAVA_UTF8).getStr());
 #endif
 
     OUString aLibName( pJLibName );
diff --git a/javaunohelper/source/preload.cxx b/javaunohelper/source/preload.cxx
index aa34d33c7df9..85eb09266dfe 100644
--- a/javaunohelper/source/preload.cxx
+++ b/javaunohelper/source/preload.cxx
@@ -31,7 +31,6 @@
 #define SAL_DLLPREFIX ""
 #endif
 
-using ::rtl::OUString;
 
 extern "C"
 {
diff --git a/javaunohelper/source/vm.cxx b/javaunohelper/source/vm.cxx
index ba89bd921311..6b518f38bc1f 100644
--- a/javaunohelper/source/vm.cxx
+++ b/javaunohelper/source/vm.cxx
@@ -74,10 +74,10 @@ css::uno::Reference< css::uno::XInterface > SingletonFactory::createInstanceWith
     css::uno::Any arg(
         css::uno::makeAny(
             css::beans::NamedValue(
-                rtl::OUString( "UnoVirtualMachine" ),
+                OUString( "UnoVirtualMachine" ),
                 css::uno::makeAny( handle ) ) ) );
     return xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
-        ::rtl::OUString(
+        OUString(
                 "com.sun.star.java.JavaVirtualMachine"),
         css::uno::Sequence< css::uno::Any >( &arg, 1 ), xContext );
 }
@@ -87,7 +87,7 @@ css::uno::Reference< css::uno::XInterface > SingletonFactory::createInstanceWith
     throw (css::uno::Exception)
 {
     return xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
-        ::rtl::OUString(
+        OUString(
                 "com.sun.star.java.JavaVirtualMachine"),
         args, xContext );
 }
@@ -108,7 +108,7 @@ namespace javaunohelper {
             loader );
     } catch ( ::jvmaccess::UnoVirtualMachine::CreationException & ) {
         throw css::uno::RuntimeException(
-            ::rtl::OUString(
+            OUString(
                 RTL_CONSTASCII_USTRINGPARAM(
                     "jmvaccess::UnoVirtualMachine::CreationException"
                     " occurred" ) ),
@@ -122,7 +122,7 @@ css::uno::Reference< css::uno::XComponentContext > install_vm_singleton(
 {
     css::uno::Reference< css::lang::XSingleComponentFactory > xFac( new SingletonFactory( vm_access ) );
     ::cppu::ContextEntry_Init entry(
-        ::rtl::OUString(
+        OUString(
                 "/singletons/com.sun.star.java.theJavaVirtualMachine"),
         css::uno::makeAny( xFac ), true );
     return ::cppu::createComponentContext( &entry, 1, xContext );