targeted string re-work

Change-Id: I31c752d044774cf4cec4aaab9bb2e43570d41953
This commit is contained in:
Norbert Thiebaud 2012-05-30 16:12:54 -05:00
parent 1488171272
commit d79705d1df

View File

@ -69,7 +69,7 @@ bool isAccessibilitySupportDesired()
{ {
OUString sValue; OUString sValue;
if ((sal_True == ::rtl::Bootstrap::get( if ((sal_True == ::rtl::Bootstrap::get(
OUString(RTL_CONSTASCII_USTRINGPARAM("JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY")), sValue)) && sValue == "1" OUString("JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY"), sValue)) && sValue == "1"
) )
return false; return false;
@ -260,7 +260,7 @@ rtl::OUString findPlugin(
} }
rtl::OUString retVal; rtl::OUString retVal;
rtl::OUString sProgDir = getExecutableDirectory(); rtl::OUString sProgDir = getExecutableDirectory();
sUrl = sProgDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) sUrl = sProgDir + rtl::OUString("/")
+ plugin; + plugin;
jfw::FileStatus s = checkFileURL(sUrl); jfw::FileStatus s = checkFileURL(sUrl);
if (s == jfw::FILE_INVALID || s == jfw::FILE_DOES_NOT_EXIST) if (s == jfw::FILE_INVALID || s == jfw::FILE_DOES_NOT_EXIST)
@ -272,11 +272,11 @@ rtl::OUString findPlugin(
rtl::OUString url; rtl::OUString url;
#ifdef UNX #ifdef UNX
#if defined(MACOSX) #if defined(MACOSX)
rtl::OUString path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DYLD_LIBRARY_PATH")); rtl::OUString path = rtl::OUString("DYLD_LIBRARY_PATH");
#elif defined(AIX) #elif defined(AIX)
rtl::OUString path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LIBPATH")); rtl::OUString path = rtl::OUString("LIBPATH");
#else #else
rtl::OUString path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LD_LIBRARY_PATH")); rtl::OUString path = rtl::OUString("LD_LIBRARY_PATH");
#endif #endif
rtl::OUString env_path; rtl::OUString env_path;
oslProcessError err = osl_getEnvironment(path.pData, &env_path.pData); oslProcessError err = osl_getEnvironment(path.pData, &env_path.pData);