diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /bridges/source | |
parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) |
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
Diffstat (limited to 'bridges/source')
21 files changed, 56 insertions, 59 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx index be610bbd2a4d..ca05bb0ae1b4 100644 --- a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx @@ -385,7 +385,7 @@ static typelib_TypeClass cpp_mediate( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( "illegal vtable index!" ), + OUString( "illegal vtable index!" ), (XInterface *)pCppI ); } @@ -479,7 +479,7 @@ static typelib_TypeClass cpp_mediate( default: { throw RuntimeException( - rtl::OUString( "no member description found!" ), + OUString( "no member description found!" ), (XInterface *)pCppI ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx index 635c7e74c53b..8017045bcb7d 100644 --- a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx @@ -361,7 +361,7 @@ static typelib_TypeClass cpp_mediate( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( "illegal vtable index!" ), + OUString( "illegal vtable index!" ), (XInterface *)pThis ); } @@ -462,7 +462,7 @@ static typelib_TypeClass cpp_mediate( #endif throw RuntimeException( - rtl::OUString( "no member description found!" ), + OUString( "no member description found!" ), (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx index 0bf81064a588..665415290bcb 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx @@ -242,7 +242,7 @@ extern "C" void cpp_vtable_call( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( "illegal vtable index!" ), + OUString( "illegal vtable index!" ), (XInterface *)pThis ); } @@ -331,7 +331,7 @@ extern "C" void cpp_vtable_call( default: { throw RuntimeException( - rtl::OUString( "no member description found!" ), + OUString( "no member description found!" ), (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx index 335e05fad1fc..970431fce11b 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx @@ -425,7 +425,7 @@ namespace if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( "illegal vtable index!" ), + OUString( "illegal vtable index!" ), (XInterface *)pThis ); } @@ -538,7 +538,7 @@ namespace fprintf(stderr,"cpp_mediate6\n"); #endif throw RuntimeException( - rtl::OUString( "no member description found!" ), + OUString( "no member description found!" ), (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx index 6d57c134f63a..fa96ed3c3704 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx @@ -384,7 +384,7 @@ static typelib_TypeClass cpp_mediate( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( "illegal vtable index!" ), + OUString( "illegal vtable index!" ), (XInterface *)pThis ); } @@ -477,7 +477,7 @@ static typelib_TypeClass cpp_mediate( default: { throw RuntimeException( - rtl::OUString( "no member description found!" ), + OUString( "no member description found!" ), (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx index 9404471a1474..a06269a4477c 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx @@ -381,7 +381,7 @@ static typelib_TypeClass cpp_mediate( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( "illegal vtable index!" ), + OUString( "illegal vtable index!" ), (XInterface *)pThis ); } @@ -482,7 +482,7 @@ static typelib_TypeClass cpp_mediate( #endif throw RuntimeException( - rtl::OUString( "no member description found!" ), + OUString( "no member description found!" ), (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx index ba384f74472d..5e97cdd35249 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx @@ -349,7 +349,7 @@ static typelib_TypeClass cpp_mediate( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( "illegal vtable index!" ), + OUString( "illegal vtable index!" ), (XInterface *)pCppI ); } @@ -443,7 +443,7 @@ static typelib_TypeClass cpp_mediate( default: { throw RuntimeException( - rtl::OUString( "no member description found!" ), + OUString( "no member description found!" ), (XInterface *)pCppI ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx index e571bd2a555c..c2bfe5ef912c 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx @@ -370,7 +370,7 @@ static typelib_TypeClass cpp_mediate( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( "illegal vtable index!" ), + OUString( "illegal vtable index!" ), (XInterface *)pCppI ); } @@ -464,7 +464,7 @@ static typelib_TypeClass cpp_mediate( default: { throw RuntimeException( - rtl::OUString( "no member description found!" ), + OUString( "no member description found!" ), (XInterface *)pCppI ); } } diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx index ea0d05a50c92..689e54f092b2 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx @@ -250,7 +250,7 @@ static typelib_TypeClass cpp_mediate( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( "illegal vtable index!" ), + OUString( "illegal vtable index!" ), (XInterface *)pThis ); } @@ -343,7 +343,7 @@ static typelib_TypeClass cpp_mediate( default: { throw RuntimeException( - rtl::OUString( "no member description found!" ), + OUString( "no member description found!" ), (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx index 95acfac20aa5..af5c4a245ee4 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx @@ -245,7 +245,7 @@ static typelib_TypeClass cpp_mediate( "### illegal vtable index!" ); if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { - throw RuntimeException( rtl::OUString( "illegal vtable index!" ), (XInterface *)pCppI ); + throw RuntimeException( OUString( "illegal vtable index!" ), (XInterface *)pCppI ); } // determine called method @@ -340,7 +340,7 @@ static typelib_TypeClass cpp_mediate( } default: { - throw RuntimeException(rtl::OUString( "no member description found!" ), (XInterface *)pCppI ); + throw RuntimeException(OUString( "no member description found!" ), (XInterface *)pCppI ); } } return eRet; diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx index 4129785d39be..a85d756a823f 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx @@ -32,9 +32,6 @@ using namespace com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OUStringToOString; namespace { diff --git a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx index b29e3a7dce26..e87512a571fc 100644 --- a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx @@ -250,7 +250,7 @@ extern "C" void cpp_vtable_call( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( "illegal vtable index!" ), + OUString( "illegal vtable index!" ), (XInterface *)pThis ); } @@ -339,7 +339,7 @@ extern "C" void cpp_vtable_call( default: { throw RuntimeException( - rtl::OUString( "no member description found!" ), + OUString( "no member description found!" ), (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx index 7859fb505092..f9d220931000 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx @@ -246,7 +246,7 @@ static typelib_TypeClass __cdecl cpp_mediate( "### illegal vtable index!" ); if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { - throw RuntimeException( rtl::OUString("illegal vtable index!"), + throw RuntimeException( OUString("illegal vtable index!"), (XInterface *)pThis ); } @@ -340,7 +340,7 @@ static typelib_TypeClass __cdecl cpp_mediate( default: { throw RuntimeException( - rtl::OUString("no member description found!"), + OUString("no member description found!"), (XInterface *)pThis ); } } @@ -446,7 +446,7 @@ bridges::cpp_uno::shared::VtableFactory::initializeBlock( Rtti(): n0(0), n1(0), n2(0), rtti(CPPU_CURRENT_NAMESPACE::msci_getRTTI( - rtl::OUString( + OUString( "com.sun.star.uno.XInterface"))) {} }; diff --git a/bridges/source/cpp_uno/msvc_win32_intel/msci.hxx b/bridges/source/cpp_uno/msvc_win32_intel/msci.hxx index 73cb40fd3c99..64fd8e71e6bf 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/msci.hxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/msci.hxx @@ -35,7 +35,7 @@ const DWORD MSVC_ExceptionCode = 0xe06d7363; const long MSVC_magic_number = 0x19930520L; //============================================================================== -type_info * msci_getRTTI( ::rtl::OUString const & rUNOname ); +type_info * msci_getRTTI( OUString const & rUNOname ); //============================================================================== int msci_filterCppException( 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<XInterface *>( 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<XInterface *>( 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( diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx index 53b40f23447c..a293d9937ca0 100644 --- a/bridges/source/cpp_uno/shared/vtablefactory.cxx +++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx @@ -245,7 +245,7 @@ bool VtableFactory::createBlock(Block &block, sal_Int32 slotCount) const strDirectory = "/tmp"; strDirectory += "/.execoooXXXXXX"; - rtl::OString aTmpName = OUStringToOString(strDirectory, osl_getThreadTextEncoding()); + OString aTmpName = OUStringToOString(strDirectory, osl_getThreadTextEncoding()); char *tmpfname = new char[aTmpName.getLength()+1]; strncpy(tmpfname, aTmpName.getStr(), aTmpName.getLength()+1); if ((block.fd = mkstemp(tmpfname)) == -1) diff --git a/bridges/source/jni_uno/jni_base.h b/bridges/source/jni_uno/jni_base.h index 7b668c17270d..61fc28479585 100644 --- a/bridges/source/jni_uno/jni_base.h +++ b/bridges/source/jni_uno/jni_base.h @@ -50,9 +50,9 @@ class JNI_info; //============================================================================== struct BridgeRuntimeError { - ::rtl::OUString m_message; + OUString m_message; - inline BridgeRuntimeError( ::rtl::OUString const & message ) + inline BridgeRuntimeError( OUString const & message ) : m_message( message ) {} }; @@ -98,7 +98,7 @@ public: inline void ensure_no_exception() const; // throws BridgeRuntimeError inline bool assert_no_exception() const; // asserts and clears exception - ::rtl::OUString get_stack_trace( jobject jo_exc = 0 ) const; + OUString get_stack_trace( jobject jo_exc = 0 ) const; }; //______________________________________________________________________________ @@ -273,7 +273,7 @@ inline TypeDescr::TypeDescr( typelib_TypeDescriptionReference * td_ref ) { throw BridgeRuntimeError( "cannot get comprehensive type description for " + - ::rtl::OUString::unacquired( &td_ref->pTypeName ) ); + OUString::unacquired( &td_ref->pTypeName ) ); } } diff --git a/bridges/source/jni_uno/jni_data.cxx b/bridges/source/jni_uno/jni_data.cxx index b73866cbc76c..2a24f58d73db 100644 --- a/bridges/source/jni_uno/jni_data.cxx +++ b/bridges/source/jni_uno/jni_data.cxx @@ -1797,7 +1797,7 @@ void Bridge::map_to_java( { // Do not lose information about type arguments of instantiated // polymorphic struct types: - rtl::OUString const & name = rtl::OUString::unacquired( + OUString const & name = OUString::unacquired( &pAny->pType->pTypeName); OSL_ASSERT(!name.isEmpty()); if (name[name.getLength() - 1] == '>') diff --git a/bridges/source/jni_uno/jni_helper.h b/bridges/source/jni_uno/jni_helper.h index 2251ad8de057..2d8514592947 100644 --- a/bridges/source/jni_uno/jni_helper.h +++ b/bridges/source/jni_uno/jni_helper.h @@ -57,12 +57,12 @@ inline void jstring_to_ustring( } //------------------------------------------------------------------------------ -inline ::rtl::OUString jstring_to_oustring( +inline OUString jstring_to_oustring( JNI_context const & jni, jstring jstr ) { rtl_uString * ustr = 0; jstring_to_ustring( jni, &ustr, jstr ); - return ::rtl::OUString( ustr, SAL_NO_ACQUIRE ); + return OUString( ustr, SAL_NO_ACQUIRE ); } //------------------------------------------------------------------------------ diff --git a/bridges/source/jni_uno/jni_info.h b/bridges/source/jni_uno/jni_info.h index ecc1cc2d74e8..63ce45dcfd24 100644 --- a/bridges/source/jni_uno/jni_info.h +++ b/bridges/source/jni_uno/jni_info.h @@ -46,10 +46,10 @@ inline bool type_equals( { if (type1 == type2) return true; - ::rtl::OUString const & name1 = - ::rtl::OUString::unacquired( &type1->pTypeName ); - ::rtl::OUString const & name2 = - ::rtl::OUString::unacquired( &type2->pTypeName ); + OUString const & name1 = + OUString::unacquired( &type1->pTypeName ); + OUString const & name2 = + OUString::unacquired( &type2->pTypeName ); return ((type1->eTypeClass == type2->eTypeClass) && name1.equals( name2 )); } @@ -57,7 +57,7 @@ inline bool type_equals( inline bool is_XInterface( typelib_TypeDescriptionReference * type ) { return ((typelib_TypeClass_INTERFACE == type->eTypeClass) && - ::rtl::OUString::unacquired( &type->pTypeName ) == "com.sun.star.uno.XInterface"); + OUString::unacquired( &type->pTypeName ) == "com.sun.star.uno.XInterface"); } //============================================================================== @@ -112,7 +112,7 @@ struct JNI_type_info_holder }; typedef ::boost::unordered_map< - ::rtl::OUString, JNI_type_info_holder, ::rtl::OUStringHash > t_str2type; + OUString, JNI_type_info_holder, OUStringHash > t_str2type; //============================================================================== class JNI_info @@ -211,10 +211,10 @@ public: typelib_TypeDescriptionReference * type ) const; JNI_type_info const * get_type_info( JNI_context const & jni, - ::rtl::OUString const & uno_name ) const; + OUString const & uno_name ) const; // inline static void append_sig( - ::rtl::OStringBuffer * buf, typelib_TypeDescriptionReference * type, + OStringBuffer * buf, typelib_TypeDescriptionReference * type, bool use_Object_for_type_XInterface = true, bool use_slashes = true ); // get this @@ -242,7 +242,7 @@ inline void JNI_info::destroy( JNIEnv * jni_env ) //______________________________________________________________________________ inline void JNI_info::append_sig( - ::rtl::OStringBuffer * buf, typelib_TypeDescriptionReference * type, + OStringBuffer * buf, typelib_TypeDescriptionReference * type, bool use_Object_for_type_XInterface, bool use_slashes ) { switch (type->eTypeClass) @@ -302,20 +302,20 @@ inline void JNI_info::append_sig( case typelib_TypeClass_STRUCT: case typelib_TypeClass_EXCEPTION: { - ::rtl::OUString const & uno_name = - ::rtl::OUString::unacquired( &type->pTypeName ); + OUString const & uno_name = + OUString::unacquired( &type->pTypeName ); buf->append( 'L' ); // Erase type arguments of instantiated polymorphic struct types: sal_Int32 i = uno_name.indexOf( '<' ); if ( i < 0 ) { buf->append( - ::rtl::OUStringToOString( + OUStringToOString( use_slashes ? uno_name.replace( '.', '/' ) : uno_name, RTL_TEXTENCODING_JAVA_UTF8 ) ); } else { - rtl::OUString s( uno_name.copy( 0, i ) ); + OUString s( uno_name.copy( 0, i ) ); buf->append( - ::rtl::OUStringToOString( + OUStringToOString( use_slashes ? s.replace( '.', '/' ) : s, RTL_TEXTENCODING_JAVA_UTF8 ) ); } @@ -342,11 +342,11 @@ inline void JNI_info::append_sig( } else { - ::rtl::OUString const & uno_name = - ::rtl::OUString::unacquired( &type->pTypeName ); + OUString const & uno_name = + OUString::unacquired( &type->pTypeName ); buf->append( 'L' ); buf->append( - ::rtl::OUStringToOString( + OUStringToOString( use_slashes ? uno_name.replace( '.', '/' ) : uno_name, RTL_TEXTENCODING_JAVA_UTF8 ) ); buf->append( ';' ); @@ -355,7 +355,7 @@ inline void JNI_info::append_sig( default: throw BridgeRuntimeError( "unsupported type: " + - ::rtl::OUString::unacquired( &type->pTypeName ) ); + OUString::unacquired( &type->pTypeName ) ); } } |