diff options
author | Ricardo Montania <ricardo@linuxafundo.com.br> | 2012-11-03 18:24:25 -0200 |
---|---|---|
committer | Radek Doulík <rodo@novell.com> | 2012-11-07 12:06:45 +0000 |
commit | da67a17d2dc3000b1d72ef9a02a48f509a009b45 (patch) | |
tree | ca7668ada5722b4494a7dedfe26e4dc6c7c1b33e /bridges/source | |
parent | f0e797a351babf2282bac801c33a485671accf1b (diff) |
::rtl::OUString -> OUString in bridges
Change-Id: I3a4fa7b108c58f100d2c8a586ec6c76af902e138
Reviewed-on: https://gerrit.libreoffice.org/974
Reviewed-by: Radek Doulík <rodo@novell.com>
Tested-by: Radek Doulík <rodo@novell.com>
Diffstat (limited to 'bridges/source')
-rw-r--r-- | bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx | 8 | ||||
-rw-r--r-- | bridges/source/cpp_uno/shared/component.cxx | 22 |
2 files changed, 15 insertions, 15 deletions
diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx index e171203f0457..b45e77686c07 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx @@ -255,13 +255,13 @@ extern "C" void cpp_vtable_call( #endif typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr(); #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "name=%s\n", rtl::OUStringToOString(pTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_UTF8).getStr() ); + fprintf( stderr, "name=%s\n", OUStringToOString(pTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_UTF8).getStr() ); #endif OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )), + OUString( "illegal vtable index!" ), (XInterface *)pThis ); } @@ -271,7 +271,7 @@ extern "C" void cpp_vtable_call( TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] ); #if OSL_DEBUG_LEVEL > 1 - fprintf(stderr, "calling %s\n", rtl::OUStringToOString(aMemberDescr.get()->pTypeName, RTL_TEXTENCODING_UTF8).getStr()); + fprintf(stderr, "calling %s\n", OUStringToOString(aMemberDescr.get()->pTypeName, RTL_TEXTENCODING_UTF8).getStr()); #endif switch (aMemberDescr.get()->eTypeClass) { @@ -352,7 +352,7 @@ extern "C" void cpp_vtable_call( default: { throw RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )), + OUString( "no member description found!" ), (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/shared/component.cxx b/bridges/source/cpp_uno/shared/component.cxx index 56eb55c6665e..fe1a08e4e910 100644 --- a/bridges/source/cpp_uno/shared/component.cxx +++ b/bridges/source/cpp_uno/shared/component.cxx @@ -58,21 +58,21 @@ namespace { #if (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) \ || (defined(__GNUC__) && defined(__APPLE__)) -static ::rtl::OUString * s_pStaticOidPart = 0; +static OUString * s_pStaticOidPart = 0; #endif -const ::rtl::OUString & SAL_CALL cppu_cppenv_getStaticOIdPart() SAL_THROW(()) +const OUString & SAL_CALL cppu_cppenv_getStaticOIdPart() SAL_THROW(()) { #if ! ((defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) \ || (defined(__GNUC__) && defined(__APPLE__))) - static ::rtl::OUString * s_pStaticOidPart = 0; + static OUString * s_pStaticOidPart = 0; #endif if (! s_pStaticOidPart) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if (! s_pStaticOidPart) { - ::rtl::OUStringBuffer aRet( 64 ); + OUStringBuffer aRet( 64 ); aRet.appendAscii( RTL_CONSTASCII_STRINGPARAM("];") ); // good guid sal_uInt8 ar[16]; @@ -83,9 +83,9 @@ const ::rtl::OUString & SAL_CALL cppu_cppenv_getStaticOIdPart() SAL_THROW(()) } #if (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) \ || (defined(__GNUC__) && defined(__APPLE__)) - s_pStaticOidPart = new ::rtl::OUString( aRet.makeStringAndClear() ); + s_pStaticOidPart = new OUString( aRet.makeStringAndClear() ); #else - static ::rtl::OUString s_aStaticOidPart( + static OUString s_aStaticOidPart( aRet.makeStringAndClear() ); s_pStaticOidPart = &s_aStaticOidPart; #endif @@ -126,12 +126,12 @@ static void s_stub_computeObjectIdentifier(va_list * pParam) if (xHome.is()) { // interface - ::rtl::OUStringBuffer oid( 64 ); + OUStringBuffer oid( 64 ); oid.append( reinterpret_cast< sal_Int64 >(xHome.get()), 16 ); oid.append( (sal_Unicode)';' ); // ;environment[context] oid.append( - *reinterpret_cast< ::rtl::OUString const * >( + *reinterpret_cast< OUString const * >( &((uno_Environment *) pEnv)->pTypeName ) ); oid.append( (sal_Unicode)'[' ); oid.append( @@ -140,7 +140,7 @@ static void s_stub_computeObjectIdentifier(va_list * pParam) 16 ); // ];good guid oid.append( cppu_cppenv_getStaticOIdPart() ); - ::rtl::OUString aRet( oid.makeStringAndClear() ); + OUString aRet( oid.makeStringAndClear() ); ::rtl_uString_acquire( *ppOId = aRet.pData ); } } @@ -240,8 +240,8 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_ext_getMapping( { uno_Mapping * pMapping = 0; - rtl::OUString from_envTypeName(cppu::EnvDcp::getTypeName(pFrom->pTypeName)); - rtl::OUString to_envTypeName(cppu::EnvDcp::getTypeName(pTo->pTypeName)); + OUString from_envTypeName(cppu::EnvDcp::getTypeName(pFrom->pTypeName)); + OUString to_envTypeName(cppu::EnvDcp::getTypeName(pTo->pTypeName)); if (0 == rtl_ustr_ascii_compare( from_envTypeName.pData->buffer, |