diff options
author | Caolán McNamara <caolanm@redhat.com> | 2010-10-25 12:38:26 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2010-10-25 16:59:32 +0100 |
commit | f379da216adead0fda881fc22a908e57c3883edd (patch) | |
tree | 94e30ff5c8f3015c15c8401786f44db261166477 /bridges | |
parent | e5e4c54da56941c1a10d34c5dc515c72efcf3200 (diff) |
micro optimizations
Diffstat (limited to 'bridges')
-rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx | 4 | ||||
-rw-r--r-- | bridges/source/remote/static/helper.cxx | 2 | ||||
-rw-r--r-- | bridges/source/remote/urp/urp_bridgeimpl.cxx | 8 | ||||
-rw-r--r-- | bridges/source/remote/urp/urp_environment.cxx | 4 | ||||
-rw-r--r-- | bridges/source/remote/urp/urp_propertyobject.cxx | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx index f346ce00749e..512b7d1f3f34 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx @@ -292,7 +292,7 @@ extern "C" typelib_TypeClass cpp_vtable_call( OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!\n" ); if ( nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex ) { - throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), + throw RuntimeException( OUString(RTL_CONSTASCII_USTRINGPARAM("illegal vtable index!")), reinterpret_cast<XInterface *>( pCppI ) ); } @@ -389,7 +389,7 @@ extern "C" typelib_TypeClass cpp_vtable_call( } default: { - throw RuntimeException( OUString::createFromAscii("no member description found!"), + throw RuntimeException( OUString(RTL_CONSTASCII_USTRINGPARAM("no member description found!")), reinterpret_cast<XInterface *>( pCppI ) ); // is here for dummy eRet = typelib_TypeClass_VOID; diff --git a/bridges/source/remote/static/helper.cxx b/bridges/source/remote/static/helper.cxx index bca6c830d1ab..f0fc40106d36 100644 --- a/bridges/source/remote/static/helper.cxx +++ b/bridges/source/remote/static/helper.cxx @@ -128,7 +128,7 @@ void SAL_CALL remote_sendQueryInterface( // get type for queryInterface OUString sCompleteMethodName = type.getTypeName(); - sCompleteMethodName += OUString::createFromAscii("::queryInterface"); + sCompleteMethodName += OUString(RTL_CONSTASCII_USTRINGPARAM("::queryInterface")); typelib_InterfaceMemberTypeDescription *pMemberType = 0; typelib_typedescription_getByName( diff --git a/bridges/source/remote/urp/urp_bridgeimpl.cxx b/bridges/source/remote/urp/urp_bridgeimpl.cxx index 1fea5e5ecf79..0e25746f0a42 100644 --- a/bridges/source/remote/urp/urp_bridgeimpl.cxx +++ b/bridges/source/remote/urp/urp_bridgeimpl.cxx @@ -205,9 +205,9 @@ void urp_BridgeImpl::applyProtocolChanges( const Properties &props ) void urp_BridgeImpl::addError( char const *pError ) { - OUString message = OUString( RTL_CONSTASCII_USTRINGPARAM( "(tid=" ) ); + OUString message = OUString(RTL_CONSTASCII_USTRINGPARAM("(tid=" )); message += OUString::valueOf( (sal_Int32 ) osl_getThreadIdentifier( 0 ) ); - message += OUString::createFromAscii( ") " ); + message += OUString(RTL_CONSTASCII_USTRINGPARAM(") ")); message += OUString::createFromAscii( pError ); MutexGuard guard( m_errorListMutex ); m_lstErrors.push_back( message ); @@ -215,9 +215,9 @@ void urp_BridgeImpl::addError( char const *pError ) void urp_BridgeImpl::addError( const OUString & error ) { - OUString message = OUString( RTL_CONSTASCII_USTRINGPARAM( "(tid=" ) ); + OUString message = OUString(RTL_CONSTASCII_USTRINGPARAM("(tid=")); message += OUString::valueOf( (sal_Int32 ) osl_getThreadIdentifier( 0 ) ); - message += OUString::createFromAscii( ") " ); + message += OUString(RTL_CONSTASCII_USTRINGPARAM(") ")); message += error; MutexGuard guard( m_errorListMutex ); m_lstErrors.push_back( message ); diff --git a/bridges/source/remote/urp/urp_environment.cxx b/bridges/source/remote/urp/urp_environment.cxx index b381c78ff9f1..f1a61896202b 100644 --- a/bridges/source/remote/urp/urp_environment.cxx +++ b/bridges/source/remote/urp/urp_environment.cxx @@ -515,8 +515,8 @@ void SAL_CALL uno_ext_getMapping( ::rtl::OUString sFromName = pFrom->pTypeName; ::rtl::OUString sToName = pTo->pTypeName; - ::rtl::OUString sUno = OUString::createFromAscii( UNO_LB_UNO ); - ::rtl::OUString sRemote = OUString::createFromAscii( "urp" ); + ::rtl::OUString sUno(RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO)); + ::rtl::OUString sRemote(RTL_CONSTASCII_USTRINGPARAM("urp")); if ( sFromName.equalsIgnoreAsciiCase( sRemote ) && sToName.equalsIgnoreAsciiCase( sUno ) ) { diff --git a/bridges/source/remote/urp/urp_propertyobject.cxx b/bridges/source/remote/urp/urp_propertyobject.cxx index 2cedf8f91765..323faee2e929 100644 --- a/bridges/source/remote/urp/urp_propertyobject.cxx +++ b/bridges/source/remote/urp/urp_propertyobject.cxx @@ -761,7 +761,7 @@ void SAL_CALL PropertyObject::implCommitChange( uno_Sequence *pSequence, uno_Any { InvalidProtocolChangeException exception; Type type = getCppuType( &exception ); - exception.Message = OUString::createFromAscii( "urp: unknown Property " ); + exception.Message = OUString(RTL_CONSTASCII_USTRINGPARAM("urp: unknown Property ")); exception.Message += pP[i].Name; exception.invalidProperty = pP[i]; exception.reason = 1; |