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 /jvmfwk/plugins/sunmajor/javaenvsetup | |
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 'jvmfwk/plugins/sunmajor/javaenvsetup')
-rw-r--r-- | jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx index c94b8b41f498..718844dc6b25 100644 --- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx +++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx @@ -28,12 +28,9 @@ #include "rtl/byteseq.hxx" #include "jvmfwk/framework.h" -using ::rtl::OUString; -using ::rtl::OUStringToOString; -using ::rtl::OString; static sal_Bool hasOption(char const * szOption, int argc, char** argv); -static rtl::OString getLD_LIBRARY_PATH(const rtl::ByteSequence & vendorData); +static OString getLD_LIBRARY_PATH(const rtl::ByteSequence & vendorData); static bool findAndSelect(JavaInfo**); #define HELP_TEXT \ @@ -98,7 +95,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) } } - rtl::OUString aVendor( pInfo->sVendor ); + OUString aVendor( pInfo->sVendor ); // Only do something if the sunjavaplugin created this JavaInfo if ( aVendor != "Sun Microsystems Inc." && aVendor != "Oracle Corporation" && @@ -114,24 +111,24 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) return 0; } - rtl::OString sPaths = getLD_LIBRARY_PATH(pInfo->arVendorData); + OString sPaths = getLD_LIBRARY_PATH(pInfo->arVendorData); fprintf(stdout, "%s\n", sPaths.getStr()); jfw_freeJavaInfo(pInfo); return 0; } -rtl::OString getLD_LIBRARY_PATH(const rtl::ByteSequence & vendorData) +OString getLD_LIBRARY_PATH(const rtl::ByteSequence & vendorData) { const sal_Unicode* chars = (sal_Unicode*) vendorData.getConstArray(); sal_Int32 len = vendorData.getLength(); - rtl::OUString sData(chars, len / 2); + OUString sData(chars, len / 2); //the runtime lib is on the first line sal_Int32 index = 0; - rtl::OUString aToken = sData.getToken( 1, '\n', index); + OUString aToken = sData.getToken( 1, '\n', index); - rtl::OString paths = - rtl::OUStringToOString(aToken, osl_getThreadTextEncoding()); + OString paths = + OUStringToOString(aToken, osl_getThreadTextEncoding()); return paths; } |