diff options
Diffstat (limited to 'bridges/source/jni_uno')
-rw-r--r-- | bridges/source/jni_uno/jni_base.h | 8 | ||||
-rw-r--r-- | bridges/source/jni_uno/jni_data.cxx | 2 | ||||
-rw-r--r-- | bridges/source/jni_uno/jni_helper.h | 4 | ||||
-rw-r--r-- | bridges/source/jni_uno/jni_info.h | 36 |
4 files changed, 25 insertions, 25 deletions
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 ) ); } } |