diff options
| author | Noel Grandin <noel@peralex.com> | 2013-11-21 15:52:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-11-22 08:07:19 +0200 |
| commit | 73342dbb82ba074d01962359dac50fb2aa36cbeb (patch) | |
| tree | addab0397681725810b42ad55ab15be3fdb4c236 /jvmfwk | |
| parent | 071c3f3e93c4c00cf57ce3c382325cd717fed511 (diff) | |
remove unnecessary RTL_CONSTASCII_STRINGPARAM
A final pass through the code, converting code to use the new
OUString and OString methods that can detect string literals.
Change-Id: Ifa6382335e5650a1c67e52006b26354e0692c710
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/source/fwkbase.cxx | 5 | ||||
| -rw-r--r-- | jvmfwk/source/fwkutil.cxx | 14 |
2 files changed, 6 insertions, 13 deletions
diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx index 0b9535e98116..79903707009b 100644 --- a/jvmfwk/source/fwkbase.cxx +++ b/jvmfwk/source/fwkbase.cxx @@ -553,7 +553,7 @@ OUString getApplicationClassPath() OUStringBuffer buf; sal_Int32 index = 0; - char szClassPathSep[] = {SAL_PATHSEPARATOR,0}; + const char szClassPathSep[] = {SAL_PATHSEPARATOR,0}; do { OUString token( sParams.getToken( 0, ' ', index ).trim() ); @@ -566,8 +566,7 @@ OUString getApplicationClassPath() if (rc == osl_File_E_None && !systemPathElement.isEmpty()) { if (buf.getLength() > 0) - buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( - szClassPathSep) ); + buf.append( szClassPathSep ); buf.append( systemPathElement ); } } diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx index 7bae8ba093b5..e17079a4dec6 100644 --- a/jvmfwk/source/fwkutil.cxx +++ b/jvmfwk/source/fwkutil.cxx @@ -208,11 +208,8 @@ OUString findPlugin( { throw FrameworkException( JFW_E_ERROR, - (OString( - RTL_CONSTASCII_STRINGPARAM( - "[Java framework] IllegalArgumentException in" - " findPlugin: ")) - + OUStringToOString(e.Message, osl_getThreadTextEncoding()))); + OString("[Java framework] IllegalArgumentException in findPlugin: ") + + OUStringToOString(e.Message, osl_getThreadTextEncoding())); } OUString sUrl; try @@ -223,12 +220,9 @@ OUString findPlugin( { throw FrameworkException( JFW_E_ERROR, - (OString( - RTL_CONSTASCII_STRINGPARAM( - "[Java framework] rtl::MalformedUriException in" - " findPlugin: ")) + OString("[Java framework] rtl::MalformedUriException in findPlugin: ") + OUStringToOString( - e.getMessage(), osl_getThreadTextEncoding()))); + e.getMessage(), osl_getThreadTextEncoding())); } if (checkFileURL(sUrl) == jfw::FILE_OK) { |