diff options
| author | Szabolcs Dezsi <dezsiszabi@hotmail.com> | 2012-04-06 19:49:53 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2012-04-06 20:03:42 +0200 |
| commit | d6bc02f8c4cd0f50f0a2631ac7634dab408efc1f (patch) | |
| tree | b5a12df1fcae025715633469b75ab4c9b6f6d279 /cli_ure | |
| parent | 0e1c0587617e0a6e4295a13599e97cdf6d1d2ea9 (diff) | |
Replaced equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(...)) with == operator
Diffstat (limited to 'cli_ure')
| -rw-r--r-- | cli_ure/source/climaker/climaker_emit.cxx | 15 | ||||
| -rw-r--r-- | cli_ure/source/uno_bridge/cli_bridge.cxx | 6 |
2 files changed, 7 insertions, 14 deletions
diff --git a/cli_ure/source/climaker/climaker_emit.cxx b/cli_ure/source/climaker/climaker_emit.cxx index d7d20e405f9b..7dace0bb4c37 100644 --- a/cli_ure/source/climaker/climaker_emit.cxx +++ b/cli_ure/source/climaker/climaker_emit.cxx @@ -648,13 +648,11 @@ Assembly * TypeEmitter::type_resolve( OUString uno_name( xType->getName() ); if (TypeClass_EXCEPTION == xType->getTypeClass()) { - if (uno_name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( - "com.sun.star.uno.Exception") )) + if ( uno_name == "com.sun.star.uno.Exception" ) { return get_type_Exception(); } - if (uno_name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( - "com.sun.star.uno.RuntimeException") )) + if ( uno_name == "com.sun.star.uno.RuntimeException" ) { return get_type_RuntimeException(); } @@ -723,8 +721,7 @@ Assembly * TypeEmitter::type_resolve( Reference< reflection::XInterfaceTypeDescription2 > const & xType ) { OUString uno_name( xType->getName() ); - if (uno_name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("com.sun.star.uno.XInterface") )) + if ( uno_name == "com.sun.star.uno.XInterface" ) { return __typeof (::System::Object); } @@ -750,8 +747,7 @@ Assembly * TypeEmitter::type_resolve( Reference<reflection::XInterfaceTypeDescription2> xIfaceTd = resolveInterfaceTypedef(seqBaseTypes[i]); - if (xIfaceTd->getName().equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("com.sun.star.uno.XInterface") ) == sal_False) + if ( xIfaceTd->getName() != "com.sun.star.uno.XInterface" ) { vecBaseTypes.push_back(xIfaceTd); } @@ -867,8 +863,7 @@ Assembly * TypeEmitter::type_resolve( Reference<reflection::XInterfaceTypeDescription2> aBaseType = resolveInterfaceTypedef( seqBaseTypes[i]); - if (aBaseType->getName().equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("com.sun.star.uno.XInterface") ) == sal_False) + if ( aBaseType->getName() != "com.sun.star.uno.XInterface" ) { ::System::String * basetype_name = to_cts_name( aBaseType->getName() ); iface_entry * base_entry = dynamic_cast< iface_entry * >( diff --git a/cli_ure/source/uno_bridge/cli_bridge.cxx b/cli_ure/source/uno_bridge/cli_bridge.cxx index c910d8e5953f..3fb843b2c41d 100644 --- a/cli_ure/source/uno_bridge/cli_bridge.cxx +++ b/cli_ure/source/uno_bridge/cli_bridge.cxx @@ -326,16 +326,14 @@ void SAL_CALL uno_ext_getMapping( try { - if (from_env_typename.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_LB_CLI) ) && - to_env_typename.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_LB_UNO) )) + if ( from_env_typename == UNO_LB_CLI && to_env_typename == UNO_LB_UNO ) { Bridge * bridge = new Bridge( pFrom, pTo->pExtEnv, true ); // ref count = 1 mapping = &bridge->m_cli2uno; uno_registerMapping( &mapping, Bridge_free, pFrom, (uno_Environment *)pTo->pExtEnv, 0 ); } - else if (from_env_typename.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_LB_UNO) ) && - to_env_typename.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_LB_CLI) )) + else if ( from_env_typename == UNO_LB_UNO && to_env_typename == UNO_LB_CLI ) { Bridge * bridge = new Bridge( pTo, pFrom->pExtEnv, false ); // ref count = 1 mapping = &bridge->m_uno2cli; |