[Libreoffice-commits] .: Branch 'libreoffice-3-3' - fpicker/source

[Lubos Lunak]

 fpicker/source/unx/kde_unx/UnxFilePicker.cxx |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 8424af3e1b69f00f442a5a49a964813ede2f09e7
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Fri Mar 18 13:18:58 2011 +0100

    use full path for kdefilepicker helper binary (bnc#31109)
    
    ack by pmladek

diff --git a/fpicker/source/unx/kde_unx/UnxFilePicker.cxx b/fpicker/source/unx/kde_unx/UnxFilePicker.cxx
index 21e32dc..c38ffce 100644
--- a/fpicker/source/unx/kde_unx/UnxFilePicker.cxx
+++ b/fpicker/source/unx/kde_unx/UnxFilePicker.cxx
@@ -38,8 +38,10 @@
 
 #include <cppuhelper/interfacecontainer.h>
 #include <osl/diagnose.h>
+#include <osl/file.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <rtl/bootstrap.hxx>
 #include <tools/resmgr.hxx>
 
 #include <svtools/svtools.hrc>
@@ -715,7 +717,11 @@ void UnxFilePicker::initFilePicker()
 #endif
 
         // The executable name
-        const char *pFname = "kdefilepicker";
+        rtl::OUString helperurl( RTL_CONSTASCII_USTRINGPARAM("${ORIGIN}/kdefilepicker"));
+        rtl::Bootstrap::expandMacros( helperurl );
+        rtl::OUString helperpath;
+        osl::FileBase::getSystemPathFromFileURL( helperurl, helperpath );
+        rtl::OString helper( rtl::OUStringToOString( helperpath, osl_getThreadTextEncoding()));
 
         // ID of the main window
         const int nIdLen = 20;
@@ -736,7 +742,7 @@ void UnxFilePicker::initFilePicker()
         }
 
         // Execute the fpicker implementation
-        execlp( pFname, pFname, "--winid", pWinId, NULL );
+        execlp( helper.getStr(), helper.getStr(), "--winid", pWinId, NULL );
 
         // Error, finish the child
         exit( -1 );