diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 09:22:44 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 09:00:26 +0000 |
| commit | 8b27d78b4afaa9c47ca0fda144c8060f2f14046b (patch) | |
| tree | 2dbddceebf0f96492adc5652697e8efce8a8ba06 /idlc | |
| parent | fe8eba5faa59ddf9ee82f3eb009daac72a0ec846 (diff) | |
automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings
Done with a perl regex:
s/OUString\s*\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/OUString\($1\)/gms
Change-Id: Idf28320817cdcbea6d0f7ec06a9bf51bd2c3b3ec
Reviewed-on: https://gerrit.libreoffice.org/2832
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'idlc')
| -rw-r--r-- | idlc/source/astdump.cxx | 4 | ||||
| -rw-r--r-- | idlc/source/astoperation.cxx | 2 | ||||
| -rw-r--r-- | idlc/source/idlccompile.cxx | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/idlc/source/astdump.cxx b/idlc/source/astdump.cxx index efce89b1b8ca..684555ce75b3 100644 --- a/idlc/source/astdump.cxx +++ b/idlc/source/astdump.cxx @@ -304,7 +304,7 @@ sal_Bool AstService::dump(RegistryKey& rKey) if (m_defaultConstructor) { writer.setMethodData( constructorIndex++, emptyStr, RT_MODE_TWOWAY, - emptyStr, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("void")), + emptyStr, rtl::OUString("void"), 0, 0); } sal_uInt32 size; @@ -396,7 +396,7 @@ void AstAttribute::dumpExceptions( writer.setMethodData( idx, documentation, flags, OStringToOUString(getLocalName(), RTL_TEXTENCODING_UTF8), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("void")), 0, + rtl::OUString("void"), 0, static_cast< sal_uInt16 >(exceptions.size())); sal_uInt16 exceptionIndex = 0; for (DeclList::const_iterator i(exceptions.begin()); diff --git a/idlc/source/astoperation.cxx b/idlc/source/astoperation.cxx index f1d11174a057..b4aa3f74354e 100644 --- a/idlc/source/astoperation.cxx +++ b/idlc/source/astoperation.cxx @@ -48,7 +48,7 @@ sal_Bool AstOperation::dumpBlob(typereg::Writer & rBlob, sal_uInt16 index) rtl::OUString returnTypeName; if (m_pReturnType == 0) { - returnTypeName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("void")); + returnTypeName = rtl::OUString("void"); } else { returnTypeName = rtl::OStringToOUString( m_pReturnType->getRelativName(), RTL_TEXTENCODING_UTF8); diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx index 1acbf8440ede..13a8b3fa63c1 100644 --- a/idlc/source/idlccompile.cxx +++ b/idlc/source/idlccompile.cxx @@ -289,7 +289,7 @@ sal_Int32 compileFile(const OString * pathname) } while( nIndex != -1 ); } - lCppArgs.push_back(OUString(RTL_CONSTASCII_USTRINGPARAM("-o"))); + lCppArgs.push_back(OUString("-o")); cppArgs.append(preprocFile); lCppArgs.push_back(OStringToOUString(cppArgs.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); @@ -308,9 +308,9 @@ sal_Int32 compileFile(const OString * pathname) cpp = cpp.copy(0, idx); #if defined(SAL_W32) - cpp += OUString( RTL_CONSTASCII_USTRINGPARAM("ucpp.exe")); + cpp += OUString("ucpp.exe"); #else - cpp += OUString( RTL_CONSTASCII_USTRINGPARAM("ucpp")); + cpp += OUString("ucpp"); #endif #else // SYSTEM_UCPP cpp = OUString( RTL_CONSTASCII_USTRINGPARAM(UCPP)); |