From 1946794ae09ba732022fe6a74ea45e304ab70b84 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Sun, 7 Apr 2013 12:06:47 +0200 Subject: 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 --- bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx | 6 +++--- bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'bridges/source/cpp_uno/msvc_win32_x86-64') diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx index 32c0109757a0..dadae1f64499 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx @@ -242,7 +242,7 @@ extern "C" typelib_TypeClass cpp_vtable_call( OSL_ENSURE( nFunctionIndex < pTD->nMapFunctionIndexToMemberIndex, "### illegal vtable index!\n" ); if ( nFunctionIndex >= pTD->nMapFunctionIndexToMemberIndex ) - throw RuntimeException( rtl::OUString("Illegal vtable index!"), + throw RuntimeException( OUString("Illegal vtable index!"), reinterpret_cast( pCppI ) ); // Determine called method @@ -345,7 +345,7 @@ extern "C" typelib_TypeClass cpp_vtable_call( } default: { - throw RuntimeException( rtl::OUString("No member description found!"), + throw RuntimeException( OUString("No member description found!"), reinterpret_cast( pCppI ) ); } } @@ -456,7 +456,7 @@ bridges::cpp_uno::shared::VtableFactory::initializeBlock( Rtti(): n0(0), n1(0), n2(0), rtti(CPPU_CURRENT_NAMESPACE::mscx_getRTTI( - rtl::OUString( + OUString( "com.sun.star.uno.XInterface"))) {} }; diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx b/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx index df3fb70110ec..715514ffc7ce 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx @@ -38,7 +38,7 @@ typedef enum { REGPARAM_INT, REGPARAM_FLT } RegParamKind; //============================================================================== -type_info * mscx_getRTTI( ::rtl::OUString const & rUNOname ); +type_info * mscx_getRTTI( OUString const & rUNOname ); //============================================================================== int mscx_filterCppException( -- cgit v1.2.3