[ooo-build-commit] Branch 'ooo-build-3-1-1' - patches/dev300

[Chris Cheney]

 patches/dev300/ubuntu-lpi.diff |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7b03695ba14f142cfde58b4592af50cd60e3e787
Author: Chris Cheney <ccheney at ubuntu.com>
Date:   Fri Aug 14 16:31:53 2009 -0500

    Update Ubuntu LPI patch to use basis-link.
    
    * patches/dev300/ubuntu-lpi.diff: Update Ubuntu LPI patch to use basis-link.

diff --git a/patches/dev300/ubuntu-lpi.diff b/patches/dev300/ubuntu-lpi.diff
index 0368dbe..84a5060 100644
--- a/patches/dev300/ubuntu-lpi.diff
+++ b/patches/dev300/ubuntu-lpi.diff
@@ -406,7 +406,7 @@
 +				Reference< com::sun::star::system::XSystemShellExecute > xSystemShell
 +					( ::comphelper::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.system.SystemShellExecute" ) ), UNO_QUERY );
 +				if ( xSystemShell.is())
-+					xSystemShell->execute( ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/lib/openoffice/basis3.0/program/ooo87965.execute.sh")), ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/bin/launchpad-integration -P openoffice.org-core -i")), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
++					xSystemShell->execute( ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/lib/openoffice/basis-link/program/ooo87965.execute.sh")), ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/bin/launchpad-integration -P openoffice.org-core -i")), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
 +
 +				break;
 +			} catch (const ::com::sun::star::uno::Exception &) {
@@ -420,7 +420,7 @@
 +				Reference< com::sun::star::system::XSystemShellExecute > xSystemShell
 +					( ::comphelper::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.system.SystemShellExecute" ) ), UNO_QUERY );
 +				if ( xSystemShell.is())
-+					xSystemShell->execute( ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/lib/openoffice/basis3.0/program/ooo87965.execute.sh")), ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/bin/launchpad-integration -P openoffice.org-core -t")), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
++					xSystemShell->execute( ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/lib/openoffice/basis-link/program/ooo87965.execute.sh")), ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/bin/launchpad-integration -P openoffice.org-core -t")), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
 +
 +				break;
 +			} catch (const ::com::sun::star::uno::Exception &) {
@@ -433,7 +433,7 @@
 +				Reference< com::sun::star::system::XSystemShellExecute > xSystemShell
 +					( ::comphelper::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.system.SystemShellExecute" ) ), UNO_QUERY );
 +				if ( xSystemShell.is())
-+					xSystemShell->execute( ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/lib/openoffice/basis3.0/program/ooo87965.execute.sh")), ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/bin/launchpad-integration -P openoffice.org-core -b")), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
++					xSystemShell->execute( ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/lib/openoffice/basis-link/program/ooo87965.execute.sh")), ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/bin/launchpad-integration -P openoffice.org-core -b")), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
 +
 +				break;
 +			} catch (const ::com::sun::star::uno::Exception &) {