Removed several useless macros: A2OU, A2S, C2U, C2S, OUSTR, OUSTRING

Change-Id: Ie859cb2dfdc7103c379fce56be88eef8fe390afd
Reviewed-on: https://gerrit.libreoffice.org/1924
Tested-by: Luboš Luňák <l.lunak@suse.cz>
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>

4 files changed, 11 insertions, 13 deletions

diff --git a/cli_ure/source/uno_bridge/cli_base.h b/cli_ure/source/uno_bridge/cli_base.h
index 505790b132b6..b03504fcc90c 100644
--- a/cli_ure/source/uno_bridge/cli_base.h
+++ b/cli_ure/source/uno_bridge/cli_base.h
@@ -34,8 +34,6 @@ struct _oslMutexImpl
 
 #using <system.dll>
 
-#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
-
 namespace cli_uno
 {
 System::Type^ loadCliType(System::String ^ typeName);
@@ -133,7 +131,7 @@ inline ::std::auto_ptr< rtl_mem > rtl_mem::allocate( ::std::size_t bytes )
 {
     void * p = rtl_allocateMemory( bytes );
     if (0 == p)
-        throw BridgeRuntimeError(OUSTR("out of memory!") );
+        throw BridgeRuntimeError("out of memory!" );
     return ::std::auto_ptr< rtl_mem >( (rtl_mem *)p );
 }
 
@@ -161,7 +159,7 @@ inline TypeDescr::TypeDescr( typelib_TypeDescriptionReference * td_ref )
     if (0 == m_td)
     {
         throw BridgeRuntimeError(
-            OUSTR("cannot get comprehensive type description for ") +
+            "cannot get comprehensive type description for " +
             *reinterpret_cast< ::rtl::OUString const * >( &td_ref->pTypeName ) );
     }
 }
diff --git a/cli_ure/source/uno_bridge/cli_bridge.cxx b/cli_ure/source/uno_bridge/cli_bridge.cxx
index 4d6a4e3a2ddb..ef9fd01b732c 100644
--- a/cli_ure/source/uno_bridge/cli_bridge.cxx
+++ b/cli_ure/source/uno_bridge/cli_bridge.cxx
@@ -90,7 +90,7 @@ void SAL_CALL Mapping_cli2uno(
 #if OSL_DEBUG_LEVEL >= 1
         OString cstr_msg(
             OUStringToOString(
-                OUSTR("[cli_uno bridge error] ") + err.m_message, RTL_TEXTENCODING_ASCII_US ) );
+                "[cli_uno bridge error] " + err.m_message, RTL_TEXTENCODING_ASCII_US ) );
         OSL_FAIL( cstr_msg.getStr() );
 #else
         (void) err; // unused
@@ -149,7 +149,7 @@ void SAL_CALL Mapping_uno2cli(
 #if OSL_DEBUG_LEVEL >= 1
         rtl::OString cstr_msg(
             rtl::OUStringToOString(
-                OUSTR("[cli_uno bridge error] ") + err.m_message, RTL_TEXTENCODING_ASCII_US ) );
+                "[cli_uno bridge error] " + err.m_message, RTL_TEXTENCODING_ASCII_US ) );
         OSL_FAIL( cstr_msg.getStr() );
 #else
         (void) err; // unused
@@ -329,7 +329,7 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_ext_getMapping(
 #if OSL_DEBUG_LEVEL >= 1
         OString cstr_msg(
             OUStringToOString(
-                OUSTR("[cli_uno bridge error] ") + err.m_message, RTL_TEXTENCODING_ASCII_US ) );
+                "[cli_uno bridge error] " + err.m_message, RTL_TEXTENCODING_ASCII_US ) );
         OSL_FAIL( cstr_msg.getStr() );
 #else
         (void) err; // unused
diff --git a/cli_ure/source/uno_bridge/cli_data.cxx b/cli_ure/source/uno_bridge/cli_data.cxx
index 373e4bf10a5f..48ad72c7a1a6 100644
--- a/cli_ure/source/uno_bridge/cli_data.cxx
+++ b/cli_ure/source/uno_bridge/cli_data.cxx
@@ -647,7 +647,7 @@ OUString mapCliTypeName(System::String^ typeName)
         {
             if (!bRightBracket)
                 throw BridgeRuntimeError(
-                    OUSTR("Typename is wrong. No matching brackets for sequence. Name is: ") +
+                    "Typename is wrong. No matching brackets for sequence. Name is: " +
                     mapCliString(typeName));
             bRightBracket = false;
             dims ++;
@@ -656,7 +656,7 @@ OUString mapCliTypeName(System::String^ typeName)
         {
             if (bRightBracket)
                 throw BridgeRuntimeError(
-                    OUSTR("Typename is wrong. No matching brackets for sequence. Name is: ") +
+                    "Typename is wrong. No matching brackets for sequence. Name is: " +
                     mapCliString(typeName));
             break;
         }
@@ -665,7 +665,7 @@ OUString mapCliTypeName(System::String^ typeName)
 
     if (bRightBracket || cur < 0)
         throw BridgeRuntimeError(
-            OUSTR("Typename is wrong. ") +
+            "Typename is wrong. " +
             mapCliString(typeName));
 
     typeName = typeName->Substring(0, cur + 1);
diff --git a/cli_ure/source/uno_bridge/cli_proxy.cxx b/cli_ure/source/uno_bridge/cli_proxy.cxx
index 61c3036ee14d..0aa031161daa 100644
--- a/cli_ure/source/uno_bridge/cli_proxy.cxx
+++ b/cli_ure/source/uno_bridge/cli_proxy.cxx
@@ -1061,7 +1061,7 @@ void SAL_CALL cli_proxy_dispatch(
                     != demanded_td.get()->eTypeClass)
                 {
                     throw BridgeRuntimeError(
-                    OUSTR("queryInterface() call demands an INTERFACE type!"));
+                    "queryInterface() call demands an INTERFACE type!");
                 }
 
                 uno_Interface * pInterface = 0;
@@ -1139,7 +1139,7 @@ void SAL_CALL cli_proxy_dispatch(
         default:
         {
             throw BridgeRuntimeError(
-                OUSTR("illegal member type description!") );
+                "illegal member type description!" );
         }
         }
     }
@@ -1147,7 +1147,7 @@ void SAL_CALL cli_proxy_dispatch(
     {
         // binary identical struct
         ::com::sun::star::uno::RuntimeException exc(
-            OUSTR("[cli_uno bridge error] ") + err.m_message,
+            "[cli_uno bridge error] " + err.m_message,
             ::com::sun::star::uno::Reference<
             ::com::sun::star::uno::XInterface >() );
         ::com::sun::star::uno::Type const & exc_type = ::getCppuType( & exc);