From 5d8f48c81eac8650315b936d0e89ad1d54b566fc Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 31 Oct 2013 14:02:40 +0100 Subject: solver doesn't solve anything... ... it is an abbreviation of "Solar Version". Since nobody can remember that: remove OUTDIR OUTDIR_FOR_BUILD SOLARVER SOLARVERSION solarpath and any mention thereof. Change-Id: Idb3031c4f25a76ac05b22ec67e3ca3e1e8e512ad Reviewed-on: https://gerrit.libreoffice.org/6515 Tested-by: LibreOffice gerrit bot Reviewed-by: Michael Stahl --- cppuhelper/test/bootstrap/bootstrap.test.cxx | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'cppuhelper/test') diff --git a/cppuhelper/test/bootstrap/bootstrap.test.cxx b/cppuhelper/test/bootstrap/bootstrap.test.cxx index ef57f71d2bf8..d49f9534d12d 100644 --- a/cppuhelper/test/bootstrap/bootstrap.test.cxx +++ b/cppuhelper/test/bootstrap/bootstrap.test.cxx @@ -147,22 +147,7 @@ static rtl::OUString s_getSDrive(void) { rtl::OUString path;//(RTL_CONSTASCII_USTRINGPARAM("file://")); - char const * tmp = getenv("SOLARVER"); - path += rtl::OUString(tmp, rtl_str_getLength(tmp), RTL_TEXTENCODING_ASCII_US); - path += rtl::OUString(SAL_PATHDELIMITER); - - tmp = getenv("INPATH"); - path += rtl::OUString(tmp, rtl_str_getLength(tmp), RTL_TEXTENCODING_ASCII_US); - path += rtl::OUString(SAL_PATHDELIMITER); -#ifdef WIN32 - path += "bin"; -#else - path += "lib"; -#endif - - tmp = getenv("UPDMINOREXT"); - if (tmp) - path += rtl::OUString(tmp, rtl_str_getLength(tmp), RTL_TEXTENCODING_ASCII_US); + // FIXME no more S drive osl::FileBase::getFileURLFromSystemPath(path, path); -- cgit v1.2.3