Kaydet (Commit) 8b451b41 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

No need to set LD_LIBRARY_PATH for xpdfimport

...at least since this is now bundled code where xpdfimport resides in the
program dir and has a proper RPATH to find the URE libs.

Change-Id: I7103af2b13d7f38fd1e864cbc4d2719391e93e94
üst d02c53bc
...@@ -59,8 +59,8 @@ ...@@ -59,8 +59,8 @@
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <boost/unordered_map.hpp> #include <boost/unordered_map.hpp>
#include <string.h> #include <string.h>
#include <stdlib.h>
#ifdef WNT #ifdef WNT
#include <stdlib.h>
#include <ctype.h> #include <ctype.h>
#endif #endif
...@@ -1031,29 +1031,6 @@ bool xpdf_ImportFromFile( const OUString& rURL, ...@@ -1031,29 +1031,6 @@ bool xpdf_ImportFromFile( const OUString& rURL,
// spawn separate process to keep LGPL/GPL code apart. // spawn separate process to keep LGPL/GPL code apart.
rtl_uString** ppEnv = NULL;
sal_uInt32 nEnv = 0;
#if defined UNX && ! defined MACOSX
OUString aStr( "$URE_LIB_DIR" );
rtl_bootstrap_expandMacros( &aStr.pData );
OUString aSysPath;
osl_getSystemPathFromFileURL( aStr.pData, &aSysPath.pData );
OUStringBuffer aEnvBuf( aStr.getLength() + 20 );
aEnvBuf.appendAscii( "LD_LIBRARY_PATH=" );
aEnvBuf.append( aSysPath );
char const * path = getenv("LD_LIBRARY_PATH");
if (path != 0 && path[0] != 0)
{
aEnvBuf.append(':');
aEnvBuf.append(
OUString(path, strlen(path), RTL_TEXTENCODING_ISO_8859_1));
}
aStr = aEnvBuf.makeStringAndClear();
ppEnv = &aStr.pData;
nEnv = 1;
#endif
rtl_uString* args[] = { aSysUPath.pData, errPathname.pData }; rtl_uString* args[] = { aSysUPath.pData, errPathname.pData };
sal_Int32 nArgs = 2; sal_Int32 nArgs = 2;
...@@ -1068,7 +1045,7 @@ bool xpdf_ImportFromFile( const OUString& rURL, ...@@ -1068,7 +1045,7 @@ bool xpdf_ImportFromFile( const OUString& rURL,
nArgs, nArgs,
osl_Process_SEARCHPATH|osl_Process_HIDDEN, osl_Process_SEARCHPATH|osl_Process_HIDDEN,
pSecurity, pSecurity,
0, ppEnv, nEnv, 0, 0, 0,
&aProcess, &pIn, &pOut, &pErr); &aProcess, &pIn, &pOut, &pErr);
osl_freeSecurityHandle(pSecurity); osl_freeSecurityHandle(pSecurity);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment