From 59b072e22b0610abc7ffdbc75873ef5cbba58de7 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 4 Nov 2015 08:29:36 +0200 Subject: yyyyy Change-Id: I9a947beefd2dfe21da8239e841ea3fb416bd1548 --- jvmfwk/source/fwkbase.cxx | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'jvmfwk') diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx index 0a7e414ed49e..8292fab24fbf 100644 --- a/jvmfwk/source/fwkbase.cxx +++ b/jvmfwk/source/fwkbase.cxx @@ -263,9 +263,7 @@ OString BootParams::getClasspath() { OString sClassPath; OUString sCP; - if (Bootstrap::get()->getFrom( - OUString(UNO_JAVA_JFW_CLASSPATH), - sCP)) + if (Bootstrap::get()->getFrom( UNO_JAVA_JFW_CLASSPATH, sCP )) { sClassPath = OUStringToOString(sCP, osl_getThreadTextEncoding()); SAL_INFO( @@ -275,9 +273,7 @@ OString BootParams::getClasspath() } OUString sEnvCP; - if (Bootstrap::get()->getFrom( - OUString(UNO_JAVA_JFW_ENV_CLASSPATH), - sEnvCP)) + if (Bootstrap::get()->getFrom( UNO_JAVA_JFW_ENV_CLASSPATH, sEnvCP )) { char * pCp = getenv("CLASSPATH"); if (pCp) @@ -336,10 +332,8 @@ OUString BootParams::getJREHome() { OUString sJRE; OUString sEnvJRE; - bool bJRE = Bootstrap::get()->getFrom( - OUString(UNO_JAVA_JFW_JREHOME) ,sJRE); - bool bEnvJRE = Bootstrap::get()->getFrom( - OUString(UNO_JAVA_JFW_ENV_JREHOME) ,sEnvJRE); + bool bJRE = Bootstrap::get()->getFrom(UNO_JAVA_JFW_JREHOME, sJRE); + bool bEnvJRE = Bootstrap::get()->getFrom(UNO_JAVA_JFW_ENV_JREHOME, sEnvJRE); if (bJRE && bEnvJRE) { @@ -394,9 +388,7 @@ OUString BootParams::getJREHome() OUString BootParams::getClasspathUrls() { OUString sParams; - Bootstrap::get()->getFrom( - OUString(UNO_JAVA_JFW_CLASSPATH_URLS), - sParams); + Bootstrap::get()->getFrom( UNO_JAVA_JFW_CLASSPATH_URLS, sParams); SAL_INFO( "jfw.level2", "Using bootstrap parameter " UNO_JAVA_JFW_CLASSPATH_URLS " = " -- cgit