Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Evergreen:11.2
libreoffice-bootstrap
kde3-fpicker.diff
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File kde3-fpicker.diff of Package libreoffice-bootstrap
commit 16b7cf288722a40ad7d847c829c3a4fba570cf0a Author: Luboš Luňák <l.lunak@suse.cz> Date: Fri Mar 18 13:18:58 2011 +0100 use full path for kdefilepicker helper binary (bnc#31109) diff --git a/fpicker/source/unx/kde_unx/UnxFilePicker.cxx b/fpicker/source/unx/kde_unx/UnxFilePicker.cxx index 8c7cd91..c2756ee 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 );
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor