diff options
Diffstat (limited to 'bridges')
28 files changed, 129 insertions, 135 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 ) ); } } diff --git a/bridges/test/java_uno/acquire/testacquire.cxx b/bridges/test/java_uno/acquire/testacquire.cxx index a0f5ef65cd91..e88be55b3e01 100644 --- a/bridges/test/java_uno/acquire/testacquire.cxx +++ b/bridges/test/java_uno/acquire/testacquire.cxx @@ -180,19 +180,19 @@ class Service: public cppu::WeakImplHelper3< css::lang::XServiceInfo, css::lang::XMain, test::javauno::acquire::XTest > { public: - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException) { return getImplementationName_static(); } - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & serviceName) + virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) throw (css::uno::RuntimeException); - virtual css::uno::Sequence< rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException) { return getSupportedServiceNames_static(); } virtual sal_Int32 SAL_CALL - run(css::uno::Sequence< rtl::OUString > const & arguments) + run(css::uno::Sequence< OUString > const & arguments) throw (css::uno::RuntimeException); virtual void SAL_CALL setInterfaceToInterface( @@ -294,9 +294,9 @@ public: throw (css::uno::RuntimeException) { return obj; } - static rtl::OUString getImplementationName_static(); + static OUString getImplementationName_static(); - static css::uno::Sequence< rtl::OUString > + static css::uno::Sequence< OUString > getSupportedServiceNames_static(); static css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( @@ -316,10 +316,10 @@ private: } -sal_Bool Service::supportsService(rtl::OUString const & serviceName) +sal_Bool Service::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException) { - css::uno::Sequence< rtl::OUString > names( + css::uno::Sequence< OUString > names( getSupportedServiceNames_static()); for (sal_Int32 i = 0; i< names.getLength(); ++i) { if (names[i] == serviceName) { @@ -341,7 +341,7 @@ template< typename T > void assertNotNull(css::uno::Reference< T > const & ref) } -sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments) +sal_Int32 Service::run(css::uno::Sequence< OUString > const & arguments) throw (css::uno::RuntimeException) { // - arguments[0] must be the UNO URL to connect to: @@ -477,13 +477,13 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments) return 0; } -rtl::OUString Service::getImplementationName_static() { - return rtl::OUString( "com.sun.star.test.bridges.testacquire.impl" ); +OUString Service::getImplementationName_static() { + return OUString( "com.sun.star.test.bridges.testacquire.impl" ); } -css::uno::Sequence< rtl::OUString > Service::getSupportedServiceNames_static() { - css::uno::Sequence< rtl::OUString > names(1); - names[0] = rtl::OUString( "com.sun.star.test.bridges.testacquire" ); +css::uno::Sequence< OUString > Service::getSupportedServiceNames_static() { + css::uno::Sequence< OUString > names(1); + names[0] = OUString( "com.sun.star.test.bridges.testacquire" ); return names; } @@ -515,11 +515,11 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(char const namespace { -bool writeInfo(void * registryKey, rtl::OUString const & implementationName, - css::uno::Sequence< rtl::OUString > const & serviceNames) { - rtl::OUString keyName( "/" ); +bool writeInfo(void * registryKey, OUString const & implementationName, + css::uno::Sequence< OUString > const & serviceNames) { + OUString keyName( "/" ); keyName += implementationName; - keyName += rtl::OUString( "/UNO/SERVICES" ); + keyName += OUString( "/UNO/SERVICES" ); css::uno::Reference< css::registry::XRegistryKey > key; try { key = static_cast< css::registry::XRegistryKey * >(registryKey)-> diff --git a/bridges/test/java_uno/any/transport.cxx b/bridges/test/java_uno/any/transport.cxx index fda624987eca..2200e322871a 100644 --- a/bridges/test/java_uno/any/transport.cxx +++ b/bridges/test/java_uno/any/transport.cxx @@ -32,7 +32,6 @@ using namespace ::com::sun::star::uno; using ::test::java_uno::anytest::XTransport; -using ::rtl::OUString; namespace { diff --git a/bridges/test/java_uno/equals/testequals.cxx b/bridges/test/java_uno/equals/testequals.cxx index 5c274934465c..a56e5b928a39 100644 --- a/bridges/test/java_uno/equals/testequals.cxx +++ b/bridges/test/java_uno/equals/testequals.cxx @@ -52,28 +52,28 @@ class Service: public cppu::WeakImplHelper2< css::lang::XServiceInfo, test::java_uno::equals::XTestInterface > { public: - virtual inline rtl::OUString SAL_CALL getImplementationName() + virtual inline OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException) - { return rtl::OUString::createFromAscii(getImplementationName_static()); } + { return OUString::createFromAscii(getImplementationName_static()); } virtual sal_Bool SAL_CALL supportsService( - rtl::OUString const & rServiceName) throw (css::uno::RuntimeException); + OUString const & rServiceName) throw (css::uno::RuntimeException); - virtual inline css::uno::Sequence< rtl::OUString > SAL_CALL + virtual inline css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException) { return getSupportedServiceNames_static(); } - virtual void SAL_CALL connect(rtl::OUString const & rConnection, - rtl::OUString const & rProtocol) + virtual void SAL_CALL connect(OUString const & rConnection, + OUString const & rProtocol) throw (css::uno::Exception); virtual css::uno::Reference< css::uno::XInterface > SAL_CALL get( - rtl::OUString const & rName) throw (css::uno::RuntimeException); + OUString const & rName) throw (css::uno::RuntimeException); static inline sal_Char const * getImplementationName_static() { return "com.sun.star.test.bridges.testequals.impl"; } - static css::uno::Sequence< rtl::OUString > + static css::uno::Sequence< OUString > getSupportedServiceNames_static(); static css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( @@ -91,10 +91,10 @@ private: } -sal_Bool Service::supportsService(rtl::OUString const & rServiceName) +sal_Bool Service::supportsService(OUString const & rServiceName) throw (css::uno::RuntimeException) { - css::uno::Sequence< rtl::OUString > aNames( + css::uno::Sequence< OUString > aNames( getSupportedServiceNames_static()); for (sal_Int32 i = 0; i< aNames.getLength(); ++i) if (aNames[i] == rServiceName) @@ -102,31 +102,31 @@ sal_Bool Service::supportsService(rtl::OUString const & rServiceName) return false; } -void Service::connect(rtl::OUString const & rConnection, - rtl::OUString const & rProtocol) +void Service::connect(OUString const & rConnection, + OUString const & rProtocol) throw (css::uno::Exception) { css::uno::Reference< css::connection::XConnection > xConnection( css::connection::Connector::create(m_xContext)->connect(rConnection)); css::uno::Reference< css::bridge::XBridgeFactory > xBridgeFactory( m_xContext->getServiceManager()->createInstanceWithContext( - rtl::OUString( "com.sun.star.bridge.BridgeFactory" ), + OUString( "com.sun.star.bridge.BridgeFactory" ), m_xContext), css::uno::UNO_QUERY); - m_xBridge = xBridgeFactory->createBridge(rtl::OUString(), rProtocol, + m_xBridge = xBridgeFactory->createBridge(OUString(), rProtocol, xConnection, 0); } css::uno::Reference< css::uno::XInterface > -Service::get(rtl::OUString const & rName) throw (css::uno::RuntimeException) +Service::get(OUString const & rName) throw (css::uno::RuntimeException) { return m_xBridge->getInstance(rName); } -css::uno::Sequence< rtl::OUString > Service::getSupportedServiceNames_static() +css::uno::Sequence< OUString > Service::getSupportedServiceNames_static() { - css::uno::Sequence< rtl::OUString > aNames(1); - aNames[0] = rtl::OUString( "com.sun.star.test.bridges.testequals" ); + css::uno::Sequence< OUString > aNames(1); + aNames[0] = OUString( "com.sun.star.test.bridges.testequals" ); return aNames; } @@ -160,7 +160,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(sal_Char co css::uno::Reference< css::lang::XSingleComponentFactory > xFactory(cppu::createSingleComponentFactory( &Service::createInstance, - rtl::OUString::createFromAscii( + OUString::createFromAscii( Service::getImplementationName_static()), Service::getSupportedServiceNames_static())); if (xFactory.is()) @@ -175,11 +175,11 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(sal_Char co namespace { bool writeInfo(void * pRegistryKey, sal_Char const * pImplementationName, - css::uno::Sequence< rtl::OUString > const & rServiceNames) + css::uno::Sequence< OUString > const & rServiceNames) { - rtl::OUString aKeyName( "/" ); - aKeyName += rtl::OUString::createFromAscii(pImplementationName); - aKeyName += rtl::OUString( "/UNO/SERVICES" ); + OUString aKeyName( "/" ); + aKeyName += OUString::createFromAscii(pImplementationName); + aKeyName += OUString( "/UNO/SERVICES" ); css::uno::Reference< css::registry::XRegistryKey > xKey; try { diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx index 907b4b41f2bd..d5a66169a634 100644 --- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx +++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx @@ -59,7 +59,7 @@ public: private: virtual ~Client() {} - virtual sal_Int32 SAL_CALL run(css::uno::Sequence< rtl::OUString > const &) + virtual sal_Int32 SAL_CALL run(css::uno::Sequence< OUString > const &) throw (css::uno::RuntimeException); virtual sal_Int32 SAL_CALL get() throw (css::uno::RuntimeException); @@ -68,34 +68,34 @@ private: osl::ThreadData data; }; -sal_Int32 Client::run(css::uno::Sequence< rtl::OUString > const &) +sal_Int32 Client::run(css::uno::Sequence< OUString > const &) throw (css::uno::RuntimeException) { css::uno::Reference< css::lang::XMultiComponentFactory > factory( context->getServiceManager()); if (!factory.is()) { throw new css::uno::RuntimeException( - rtl::OUString( "no component context service manager" ), + OUString( "no component context service manager" ), static_cast< cppu::OWeakObject * >(this)); } css::uno::Reference< test::javauno::nativethreadpool::XRelay > relay; try { relay = css::uno::Reference< test::javauno::nativethreadpool::XRelay >( factory->createInstanceWithContext( - rtl::OUString( "test.javauno.nativethreadpool.Relay" ), + OUString( "test.javauno.nativethreadpool.Relay" ), context), css::uno::UNO_QUERY_THROW); } catch (css::uno::RuntimeException &) { throw; } catch (css::uno::Exception & e) { throw css::lang::WrappedTargetRuntimeException( - rtl::OUString( "creating test.javauno.nativethreadpool.Relay service" ), + OUString( "creating test.javauno.nativethreadpool.Relay service" ), static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); } relay->start(this); if (!data.setData(reinterpret_cast< void * >(12345))) { throw new css::uno::RuntimeException( - rtl::OUString( "osl::ThreadData::setData failed" ), + OUString( "osl::ThreadData::setData failed" ), static_cast< cppu::OWeakObject * >(this)); } css::uno::Reference< test::javauno::nativethreadpool::XSource > source; @@ -103,19 +103,19 @@ sal_Int32 Client::run(css::uno::Sequence< rtl::OUString > const &) source = css::uno::Reference< test::javauno::nativethreadpool::XSource >( css::bridge::UnoUrlResolver::create(context)->resolve( - rtl::OUString( "uno:socket,host=localhost,port=3830;urp;test" )), + OUString( "uno:socket,host=localhost,port=3830;urp;test" )), css::uno::UNO_QUERY_THROW); } catch (css::connection::NoConnectException & e) { throw css::lang::WrappedTargetRuntimeException( - rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), + OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); } catch (css::connection::ConnectionSetupException & e) { throw css::lang::WrappedTargetRuntimeException( - rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), + OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); } catch (css::lang::IllegalArgumentException & e) { throw css::lang::WrappedTargetRuntimeException( - rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), + OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); } bool success = source->get() == 12345; @@ -134,12 +134,12 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create( return static_cast< cppu::OWeakObject * >(new Client(context)); } -rtl::OUString SAL_CALL getImplementationName() { - return rtl::OUString( "test.javauno.nativethreadpool.client" ); +OUString SAL_CALL getImplementationName() { + return OUString( "test.javauno.nativethreadpool.client" ); } -css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() { - return css::uno::Sequence< rtl::OUString >(); +css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() { + return css::uno::Sequence< OUString >(); } cppu::ImplementationEntry entries[] = { diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx index 6b7490b7732a..d81876f91895 100644 --- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx +++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx @@ -64,7 +64,7 @@ sal_Int32 Server::get() throw (css::uno::RuntimeException) { context->getServiceManager()); if (!factory.is()) { throw new css::uno::RuntimeException( - rtl::OUString( "no component context service manager" ), + OUString( "no component context service manager" ), static_cast< cppu::OWeakObject * >(this)); } css::uno::Reference< test::javauno::nativethreadpool::XSource > source; @@ -73,19 +73,19 @@ sal_Int32 Server::get() throw (css::uno::RuntimeException) { source = css::uno::Reference< test::javauno::nativethreadpool::XSource >( css::bridge::UnoUrlResolver::create(context)->resolve( - rtl::OUString( "uno:socket,host=127.0.0.1,port=3831;urp;test" )), + OUString( "uno:socket,host=127.0.0.1,port=3831;urp;test" )), css::uno::UNO_QUERY_THROW); } catch (css::connection::NoConnectException & e) { throw css::lang::WrappedTargetRuntimeException( - rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), + OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); } catch (css::connection::ConnectionSetupException & e) { throw css::lang::WrappedTargetRuntimeException( - rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), + OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); } catch (css::lang::IllegalArgumentException & e) { throw css::lang::WrappedTargetRuntimeException( - rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), + OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); } return source->get(); @@ -98,12 +98,12 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create( return static_cast< cppu::OWeakObject * >(new Server(context)); } -rtl::OUString SAL_CALL getImplementationName() { - return rtl::OUString( "test.javauno.nativethreadpool.server" ); +OUString SAL_CALL getImplementationName() { + return OUString( "test.javauno.nativethreadpool.server" ); } -css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() { - return css::uno::Sequence< rtl::OUString >(); +css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() { + return css::uno::Sequence< OUString >(); } cppu::ImplementationEntry entries[] = { diff --git a/bridges/test/testcomp.cxx b/bridges/test/testcomp.cxx index 08248b0952fe..2ccda76c5c26 100644 --- a/bridges/test/testcomp.cxx +++ b/bridges/test/testcomp.cxx @@ -44,8 +44,6 @@ using namespace ::com::sun::star::bridge; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; using namespace ::com::sun::star::test::performance; -using ::rtl::OUString; -using ::rtl::OUStringToOString; #include "testcomp.h" diff --git a/bridges/test/testcomp.h b/bridges/test/testcomp.h index 67b796d720a4..75bd05e81e4f 100644 --- a/bridges/test/testcomp.h +++ b/bridges/test/testcomp.h @@ -24,13 +24,13 @@ void parseCommandLine( char *argv[] , - ::rtl::OUString *pProtocol , ::rtl::OUString *pConnection , + OUString *pProtocol , OUString *pConnection , sal_Bool *pbLatency , sal_Bool *pbReverse); Reference< XInterface > createComponent( - const ::rtl::OUString &sServiceName, - const ::rtl::OUString &sDllName, + const OUString &sServiceName, + const OUString &sDllName, const Reference < XMultiServiceFactory > & rSMgr ); class OInterfaceTest : @@ -75,16 +75,16 @@ public: void SAL_CALL release()throw() { OWeakObject::release(); } public: // XCallMe - virtual void SAL_CALL call( const ::rtl::OUString& s, sal_Int32 nToDo ) + virtual void SAL_CALL call( const OUString& s, sal_Int32 nToDo ) throw(::com::sun::star::uno::RuntimeException, ::test::TestBridgeException); - virtual void SAL_CALL callOneway( const ::rtl::OUString& s, sal_Int32 nToDo ) + virtual void SAL_CALL callOneway( const OUString& s, sal_Int32 nToDo ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL drawLine( sal_Int32 x1, sal_Int32 y1 , sal_Int32 x2 , sal_Int32 y2 ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getsAttribute() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setsAttribute( const ::rtl::OUString& _sattribute ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getsAttribute() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setsAttribute( const OUString& _sattribute ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL callAgain( const ::com::sun::star::uno::Reference< ::test::XCallMe >& callAgain, sal_Int32 nToCall ) throw(::com::sun::star::uno::RuntimeException); @@ -92,7 +92,7 @@ public: throw(::com::sun::star::uno::RuntimeException); ::osl::Mutex m_mutex; - ::rtl::OUString m_sAttribute; + OUString m_sAttribute; sal_Int32 m_nLastToDos; }; @@ -136,7 +136,7 @@ public: public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - getInstance( const ::rtl::OUString& sObjectName ) + getInstance( const OUString& sObjectName ) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); |