diff options
| author | Noel Grandin <noel@peralex.com> | 2013-11-04 14:00:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-11-11 11:21:26 +0200 |
| commit | e52779d2f8722c713f72aedbf475267440d729f0 (patch) | |
| tree | 0f2f15b2a7645e0b75f8057c96c90e05e1a6e7df /jvmfwk | |
| parent | e9c4ee996d5a6bf895072613ac4e488346ee5b05 (diff) | |
remove unnecessary use of OUString constructor
Change-Id: Ifb220af71857ddacd64e8204fb6d3e4aad8eef71
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx | 6 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 4 | ||||
| -rw-r--r-- | jvmfwk/source/fwkutil.cxx | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx index 25667848c54f..4f5a877b8852 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx @@ -161,7 +161,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props) return false; if (m_sJavaHome.isEmpty()) - m_sJavaHome = OUString("file:///usr/lib"); + m_sJavaHome = "file:///usr/lib"; // init m_sRuntimeLibrary OSL_ASSERT(!m_sHome.isEmpty()); @@ -226,9 +226,9 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props) #ifdef X86_64 //Make one last final legacy attempt on x86_64 in case the distro placed it in lib64 instead - if (!bRt && m_sJavaHome != OUString("file:///usr/lib")) + if (!bRt && m_sJavaHome != "file:///usr/lib") { - m_sHome = OUString("file:///usr/lib64"); + m_sHome = "file:///usr/lib64"; for(i_path ip = libpaths.begin(); ip != libpaths.end(); ++ip) { //Construct an absolute path to the possible runtime diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index b1d75f7e6c86..b1c5eaf286c4 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -403,7 +403,7 @@ bool getJavaProps(const OUString & exePath, //prepare the arguments sal_Int32 cArgs = 3; - OUString arg1 = OUString("-classpath");// + sClassPath; + OUString arg1 = "-classpath";// + sClassPath; OUString arg2 = sClassPath; OUString arg3("JREProperties"); OUString arg4 = "noaccessibility"; @@ -744,7 +744,7 @@ bool getJREInfoFromBinPath( && (index + sMapPath.getLength() == sBinPath.getLength()) && sBinPath[index - 1] == '/') { - sHome = OUString(sBinPath.getStr(), index - 1); + sHome = sBinPath.copy(index - 1); } } if (!sHome.isEmpty()) diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx index 993ddb3cf729..7bae8ba093b5 100644 --- a/jvmfwk/source/fwkutil.cxx +++ b/jvmfwk/source/fwkutil.cxx @@ -248,11 +248,11 @@ OUString findPlugin( OUString url; #ifdef UNX #if defined(MACOSX) - OUString path = OUString("DYLD_LIBRARY_PATH"); + OUString path = "DYLD_LIBRARY_PATH"; #elif defined(AIX) - OUString path = OUString("LIBPATH"); + OUString path = "LIBPATH"; #else - OUString path = OUString("LD_LIBRARY_PATH"); + OUString path = "LD_LIBRARY_PATH"; #endif OUString env_path; oslProcessError err = osl_getEnvironment(path.pData, &env_path.pData); |