diff options
| author | Chr. Rossmanith <ChrRossmanith@gmx.de> | 2013-03-15 21:59:24 +0100 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-03-16 17:12:27 +0000 |
| commit | 37d2588844889da97dcbd5b1a5141797f5c33d4f (patch) | |
| tree | e50ee27df2ed9786f4f41a19116d8c0416492216 /tools/source/misc | |
| parent | Remove STRINGPARAM in tools (qa) (diff) | |
| download | core-37d2588844889da97dcbd5b1a5141797f5c33d4f.tar.gz core-37d2588844889da97dcbd5b1a5141797f5c33d4f.zip | |
Remove RTL_CONSTASCII_(U)STRINGPARAM in tools
Change-Id: Id97070321ad6b20f349896d3b4e1ae51cc82ece7
Reviewed-on: https://gerrit.libreoffice.org/2769
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'tools/source/misc')
| -rw-r--r-- | tools/source/misc/appendunixshellword.cxx | 4 | ||||
| -rw-r--r-- | tools/source/misc/extendapplicationenvironment.cxx | 8 | ||||
| -rw-r--r-- | tools/source/misc/getprocessworkingdir.cxx | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/tools/source/misc/appendunixshellword.cxx b/tools/source/misc/appendunixshellword.cxx index 4657301145f7..6a15a1f5163c 100644 --- a/tools/source/misc/appendunixshellword.cxx +++ b/tools/source/misc/appendunixshellword.cxx @@ -37,7 +37,7 @@ void appendUnixShellWord( { OSL_ASSERT(accumulator != NULL); if (text.isEmpty()) { - accumulator->append(RTL_CONSTASCII_STRINGPARAM("''")); + accumulator->append("''"); } else { bool quoted = false; for (sal_Int32 i = 0; i < text.getLength(); ++i) { @@ -47,7 +47,7 @@ void appendUnixShellWord( accumulator->append('\''); quoted = false; } - accumulator->append(RTL_CONSTASCII_STRINGPARAM("\\'")); + accumulator->append("\\'"); } else { if (!quoted) { accumulator->append('\''); diff --git a/tools/source/misc/extendapplicationenvironment.cxx b/tools/source/misc/extendapplicationenvironment.cxx index 5fc44a2d0c4b..68181ade22d2 100644 --- a/tools/source/misc/extendapplicationenvironment.cxx +++ b/tools/source/misc/extendapplicationenvironment.cxx @@ -52,12 +52,11 @@ void extendApplicationEnvironment() { // Make sure URE_BOOTSTRAP environment variable is set (failure is fatal): rtl::OUStringBuffer env; - rtl::OUString envVar(RTL_CONSTASCII_USTRINGPARAM("URE_BOOTSTRAP")); + rtl::OUString envVar("URE_BOOTSTRAP"); rtl::OUString uri; if (rtl::Bootstrap::get(envVar, uri)) { - if (!uri.matchIgnoreAsciiCaseAsciiL( - RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.pathname:"))) + if (!uri.matchIgnoreAsciiCase("vnd.sun.star.pathname:")) { uri = rtl::Bootstrap::encode(uri); } @@ -71,8 +70,7 @@ void extendApplicationEnvironment() { uri = uri.copy(0, i + 1); } env.append(rtl::Bootstrap::encode(uri)); - env.appendAscii( - RTL_CONSTASCII_STRINGPARAM(SAL_CONFIGFILE("fundamental"))); + env.append(SAL_CONFIGFILE("fundamental")); } rtl::OUString envValue(env.makeStringAndClear()); if (osl_setEnvironment(envVar.pData, envValue.pData) != osl_Process_E_None) { diff --git a/tools/source/misc/getprocessworkingdir.cxx b/tools/source/misc/getprocessworkingdir.cxx index 916915a5a9bd..115e5c86aa2b 100644 --- a/tools/source/misc/getprocessworkingdir.cxx +++ b/tools/source/misc/getprocessworkingdir.cxx @@ -34,7 +34,7 @@ namespace tools { bool getProcessWorkingDir(rtl::OUString &rUrl) { rUrl = rtl::OUString(); - rtl::OUString s(RTL_CONSTASCII_USTRINGPARAM("$OOO_CWD")); + rtl::OUString s("$OOO_CWD"); rtl::Bootstrap::expandMacros(s); if (s.isEmpty()) { |