Kaydet (Commit) f379da21 authored tarafından Caolán McNamara's avatar Caolán McNamara

micro optimizations

üst e5e4c54d
...@@ -292,7 +292,7 @@ extern "C" typelib_TypeClass cpp_vtable_call( ...@@ -292,7 +292,7 @@ extern "C" typelib_TypeClass cpp_vtable_call(
OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!\n" ); OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!\n" );
if ( nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex ) if ( nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex )
{ {
throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), throw RuntimeException( OUString(RTL_CONSTASCII_USTRINGPARAM("illegal vtable index!")),
reinterpret_cast<XInterface *>( pCppI ) ); reinterpret_cast<XInterface *>( pCppI ) );
} }
...@@ -389,7 +389,7 @@ extern "C" typelib_TypeClass cpp_vtable_call( ...@@ -389,7 +389,7 @@ extern "C" typelib_TypeClass cpp_vtable_call(
} }
default: default:
{ {
throw RuntimeException( OUString::createFromAscii("no member description found!"), throw RuntimeException( OUString(RTL_CONSTASCII_USTRINGPARAM("no member description found!")),
reinterpret_cast<XInterface *>( pCppI ) ); reinterpret_cast<XInterface *>( pCppI ) );
// is here for dummy // is here for dummy
eRet = typelib_TypeClass_VOID; eRet = typelib_TypeClass_VOID;
......
...@@ -128,7 +128,7 @@ void SAL_CALL remote_sendQueryInterface( ...@@ -128,7 +128,7 @@ void SAL_CALL remote_sendQueryInterface(
// get type for queryInterface // get type for queryInterface
OUString sCompleteMethodName = type.getTypeName(); OUString sCompleteMethodName = type.getTypeName();
sCompleteMethodName += OUString::createFromAscii("::queryInterface"); sCompleteMethodName += OUString(RTL_CONSTASCII_USTRINGPARAM("::queryInterface"));
typelib_InterfaceMemberTypeDescription *pMemberType = 0; typelib_InterfaceMemberTypeDescription *pMemberType = 0;
typelib_typedescription_getByName( typelib_typedescription_getByName(
......
...@@ -205,9 +205,9 @@ void urp_BridgeImpl::applyProtocolChanges( const Properties &props ) ...@@ -205,9 +205,9 @@ void urp_BridgeImpl::applyProtocolChanges( const Properties &props )
void urp_BridgeImpl::addError( char const *pError ) 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::valueOf( (sal_Int32 ) osl_getThreadIdentifier( 0 ) );
message += OUString::createFromAscii( ") " ); message += OUString(RTL_CONSTASCII_USTRINGPARAM(") "));
message += OUString::createFromAscii( pError ); message += OUString::createFromAscii( pError );
MutexGuard guard( m_errorListMutex ); MutexGuard guard( m_errorListMutex );
m_lstErrors.push_back( message ); m_lstErrors.push_back( message );
...@@ -215,9 +215,9 @@ void urp_BridgeImpl::addError( char const *pError ) ...@@ -215,9 +215,9 @@ void urp_BridgeImpl::addError( char const *pError )
void urp_BridgeImpl::addError( const OUString & error ) 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::valueOf( (sal_Int32 ) osl_getThreadIdentifier( 0 ) );
message += OUString::createFromAscii( ") " ); message += OUString(RTL_CONSTASCII_USTRINGPARAM(") "));
message += error; message += error;
MutexGuard guard( m_errorListMutex ); MutexGuard guard( m_errorListMutex );
m_lstErrors.push_back( message ); m_lstErrors.push_back( message );
......
...@@ -515,8 +515,8 @@ void SAL_CALL uno_ext_getMapping( ...@@ -515,8 +515,8 @@ void SAL_CALL uno_ext_getMapping(
::rtl::OUString sFromName = pFrom->pTypeName; ::rtl::OUString sFromName = pFrom->pTypeName;
::rtl::OUString sToName = pTo->pTypeName; ::rtl::OUString sToName = pTo->pTypeName;
::rtl::OUString sUno = OUString::createFromAscii( UNO_LB_UNO ); ::rtl::OUString sUno(RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO));
::rtl::OUString sRemote = OUString::createFromAscii( "urp" ); ::rtl::OUString sRemote(RTL_CONSTASCII_USTRINGPARAM("urp"));
if ( sFromName.equalsIgnoreAsciiCase( sRemote ) && if ( sFromName.equalsIgnoreAsciiCase( sRemote ) &&
sToName.equalsIgnoreAsciiCase( sUno ) ) sToName.equalsIgnoreAsciiCase( sUno ) )
{ {
......
...@@ -761,7 +761,7 @@ void SAL_CALL PropertyObject::implCommitChange( uno_Sequence *pSequence, uno_Any ...@@ -761,7 +761,7 @@ void SAL_CALL PropertyObject::implCommitChange( uno_Sequence *pSequence, uno_Any
{ {
InvalidProtocolChangeException exception; InvalidProtocolChangeException exception;
Type type = getCppuType( &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.Message += pP[i].Name;
exception.invalidProperty = pP[i]; exception.invalidProperty = pP[i];
exception.reason = 1; exception.reason = 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment