diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /idlc/source/idlccompile.cxx | |
parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'idlc/source/idlccompile.cxx')
-rw-r--r-- | idlc/source/idlccompile.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx index 2c8beb5e4c00..894e5d8f1150 100644 --- a/idlc/source/idlccompile.cxx +++ b/idlc/source/idlccompile.cxx @@ -240,7 +240,7 @@ sal_Int32 compileFile(const OString * pathname) idlc()->setMainFileName(fileName); idlc()->setRealFileName(tmpFile); - ::std::vector< ::rtl::OUString> lCppArgs; + ::std::vector< OUString> lCppArgs; lCppArgs.push_back("-DIDL"); lCppArgs.push_back("-C"); lCppArgs.push_back("-zI"); @@ -259,7 +259,7 @@ sal_Int32 compileFile(const OString * pathname) { cppArgs.append("-I"); cppArgs.append(filePath); - lCppArgs.push_back(rtl::OStringToOUString( + lCppArgs.push_back(OStringToOUString( cppArgs.makeStringAndClear().replace('\\', '/'), RTL_TEXTENCODING_UTF8)); } @@ -273,7 +273,7 @@ sal_Int32 compileFile(const OString * pathname) { token = dOpt.getToken( 0, ' ', nIndex ); if (token.getLength()) - lCppArgs.push_back(rtl::OStringToOUString("-D" + token, RTL_TEXTENCODING_UTF8)); + lCppArgs.push_back(OStringToOUString("-D" + token, RTL_TEXTENCODING_UTF8)); } while( nIndex != -1 ); } @@ -285,7 +285,7 @@ sal_Int32 compileFile(const OString * pathname) { token = incOpt.getToken( 0, ' ', nIndex ); if (token.getLength()) - lCppArgs.push_back(rtl::OStringToOUString("-I" + token, RTL_TEXTENCODING_UTF8)); + lCppArgs.push_back(OStringToOUString("-I" + token, RTL_TEXTENCODING_UTF8)); } while( nIndex != -1 ); } @@ -322,8 +322,8 @@ sal_Int32 compileFile(const OString * pathname) rtl_uString** pCmdArgs = 0; pCmdArgs = (rtl_uString**)rtl_allocateZeroMemory(nCmdArgs * sizeof(rtl_uString*)); - ::std::vector< ::rtl::OUString >::iterator iter = lCppArgs.begin(); - ::std::vector< ::rtl::OUString >::iterator end = lCppArgs.end(); + ::std::vector< OUString >::iterator iter = lCppArgs.begin(); + ::std::vector< OUString >::iterator end = lCppArgs.end(); int i = 0; while ( iter != end ) { pCmdArgs[i++] = (*iter).pData; |