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 /codemaker | |
| parent | 0e1c0587617e0a6e4295a13599e97cdf6d1d2ea9 (diff) | |
Replaced equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(...)) with == operator
Diffstat (limited to 'codemaker')
| -rw-r--r-- | codemaker/source/cppumaker/cpputype.cxx | 12 | ||||
| -rw-r--r-- | codemaker/source/javamaker/javatype.cxx | 6 |
2 files changed, 5 insertions, 13 deletions
diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx index 64dad4dd87dc..b4eac7855472 100644 --- a/codemaker/source/cppumaker/cpputype.cxx +++ b/codemaker/source/cppumaker/cpputype.cxx @@ -1587,9 +1587,7 @@ void InterfaceType::dumpNormalGetCppuType(FileStream& o) inc(); sal_Int16 nBases = m_reader.getSuperTypeCount(); OSL_ASSERT(nBases > 0); - if (nBases == 1 - && m_reader.getSuperTypeName(0).equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("com/sun/star/uno/XInterface"))) + if (nBases == 1 && m_reader.getSuperTypeName(0) == "com/sun/star/uno/XInterface" ) { nBases = 0; } @@ -2215,9 +2213,7 @@ void InterfaceType::dumpExceptionSpecification( rtl::OUString name( m_reader.getMethodExceptionTypeName( static_cast< sal_uInt16 >(methodIndex), i)); - if (!name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( - "com/sun/star/uno/RuntimeException"))) + if ( name != "com/sun/star/uno/RuntimeException" ) { if (!first) { out << ", "; @@ -2269,9 +2265,7 @@ sal_Int32 InterfaceType::dumpExceptionTypeNames( sal_uInt16 n = m_reader.getMethodExceptionCount(methodIndex); for (sal_uInt16 i = 0; i < n; ++i) { rtl::OUString name(m_reader.getMethodExceptionTypeName(methodIndex, i)); - if (!name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( - "com/sun/star/uno/RuntimeException"))) + if ( name != "com/sun/star/uno/RuntimeException" ) { dumpExceptionTypeName(out, prefix, count++, name); } diff --git a/codemaker/source/javamaker/javatype.cxx b/codemaker/source/javamaker/javatype.cxx index 1453122ce749..ddbb20ca60dd 100644 --- a/codemaker/source/javamaker/javatype.cxx +++ b/codemaker/source/javamaker/javatype.cxx @@ -2198,8 +2198,7 @@ void handleInterfaceType( || mflags == RT_MODE_ATTRIBUTE_SET) && reader.getMethodName(j) == attrNameUtf16) { - if (!reader.getMethodReturnTypeName(j).equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("void")) + if (reader.getMethodReturnTypeName(j) != "void" || reader.getMethodParameterCount(j) != 0 || (mflags == RT_MODE_ATTRIBUTE_GET ? getter != SAL_MAX_UINT16 @@ -2895,8 +2894,7 @@ void handleService( reader.getMethodName(i))); bool defaultCtor = name.getLength() == 0; if (reader.getMethodFlags(i) != RT_MODE_TWOWAY - || (!reader.getMethodReturnTypeName(i).equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("void"))) + || (reader.getMethodReturnTypeName(i) != "void") || (defaultCtor && (methods != 1 || reader.getMethodParameterCount(i) != 0 || reader.getMethodExceptionCount(i) != 0))) |