From 6e67ad64efbf793952bae2e656a184293c157d99 Mon Sep 17 00:00:00 2001
From: Ricardo Montania <ricardo@linuxafundo.com.br>
Date: Wed, 14 Nov 2012 08:14:36 -0200
Subject: rtl::OUString -> OUString in bridges

Change-Id: I292f2007771ab12a30de6cd5a6a1ed436adcff66
Reviewed-on: https://gerrit.libreoffice.org/1057
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
---
 bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx | 4 ++--
 bridges/source/cpp_uno/cc50_solaris_intel/except.cxx  | 8 ++------
 bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx | 2 --
 3 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'bridges/source')

diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx b/bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx
index 1493f354209b..6b5349686ea3 100644
--- a/bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx
@@ -249,7 +249,7 @@ extern "C" void cpp_vtable_call(
                  "### illegal vtable index!" );
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
-        throw RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )), (XInterface *)pThis );
+        throw RuntimeException( "illegal vtable index!", (XInterface *)pThis );
     }
 
     // determine called method
@@ -338,7 +338,7 @@ extern "C" void cpp_vtable_call(
     }
     default:
     {
-        throw RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )), (XInterface *)pThis );
+        throw RuntimeException( "no member description found!", (XInterface *)pThis );
     }
     }
 }
diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx b/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx
index e2ce7a1f0e23..ab029733cf54 100644
--- a/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx
@@ -48,11 +48,7 @@
 #include <hash.cxx>
 
 // need a += operator for OString and sal_Char
-using ::rtl::OUString;
-using ::rtl::OString;
-using ::rtl::OStringBuffer;
-using ::rtl::OUStringToOString;
-using ::rtl::OStringToOUString;
+
 {
     inline OString& operator+=( OString& rString, sal_Char cAdd )
     {
@@ -423,7 +419,7 @@ void cc50_solaris_intel_fillUnoException(
 
 #if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "> c++ exception occurred: %s\n",
-             ::rtl::OUStringToOString(
+             OUStringToOString(
                  pExcTypeDescr->pTypeName,
                  RTL_TEXTENCODING_ASCII_US ).getStr() );
 #endif
diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx b/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx
index 760f0a348b2c..181f5d71f8d2 100644
--- a/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx
@@ -42,8 +42,6 @@
 
 using namespace com::sun::star::uno;
 
-using ::rtl::OUString;
-
 namespace
 {
 
-- 
cgit