mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No need to set LD_LIBRARY_PATH for xpdfimport

Browse Source 
...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
This commit is contained in:
Stephan Bergmann
2014-04-23 09:43:23 +02:00
parent d02c53bcd0
commit 8b451b41d6
1 changed files with 2 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
sdext/source/pdfimport/wrapper/wrapper.cxx
View File

@@ -59,8 +59,8 @@
#include <boost/scoped_ptr.hpp>
#include <boost/unordered_map.hpp>
#include <string.h>
#include <stdlib.h>
#ifdef WNT
#include <stdlib.h>
#include <ctype.h>
#endif
@@ -1031,29 +1031,6 @@ bool xpdf_ImportFromFile( const OUString& rURL,
// 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 };
sal_Int32 nArgs = 2;
@@ -1068,7 +1045,7 @@ bool xpdf_ImportFromFile( const OUString& rURL,
nArgs,
osl_Process_SEARCHPATH|osl_Process_HIDDEN,
pSecurity,
0, ppEnv, nEnv,
0, 0, 0,
&aProcess, &pIn, &pOut, &pErr);
osl_freeSecurityHandle(pSecurity);