diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-02-12 16:26:44 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-02-12 16:26:44 +0000 |
| commit | 21e45ba78d82034f6706ebd6e332e4aa55713e57 (patch) | |
| tree | 88f49ca34881aa7d23270ef9ae61dcc8b2c81228 /setup_native | |
| parent | 4f2395e507137aa8ca15a1632df9bd73e12a09c0 (diff) | |
INTEGRATION: CWS fwk84_SRC680 (1.2.34); FILE MERGED
2008/01/30 08:39:24 as 1.2.34.3: #153305# new STClient argument INSTANCE_URN
2008/01/29 07:37:44 as 1.2.34.2: #153305# dont quote arguments; make sure we use URLs instead system paths
2008/01/25 15:25:00 as 1.2.34.1: #153305, 153306# trigger stclient again by using a NEW job; use new features of ShellExecution Job
Diffstat (limited to 'setup_native')
| -rw-r--r-- | setup_native/registry/data/org/openoffice/Office/Jobs.xcu | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/setup_native/registry/data/org/openoffice/Office/Jobs.xcu b/setup_native/registry/data/org/openoffice/Office/Jobs.xcu index ffe3ba1f66b6..5f9e5d2fd596 100644 --- a/setup_native/registry/data/org/openoffice/Office/Jobs.xcu +++ b/setup_native/registry/data/org/openoffice/Office/Jobs.xcu @@ -5,9 +5,9 @@ * * $RCSfile: Jobs.xcu,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: hr $ $Date: 2007-11-02 12:51:10 $ + * last change: $Author: vg $ $Date: 2008-02-12 17:26:44 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -35,21 +35,21 @@ ************************************************************************ --> <oor:component-data oor:name="Jobs" oor:package="org.openoffice.Office" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <node oor:name="Jobs"> - <node oor:name="com.sun.star.jobs.stclient" oor:op="fuse"> + <node oor:name="com.sun.star.jobs.STClient" oor:op="fuse"> <prop oor:name="Service"> <value>com.sun.star.comp.framework.ShellJob</value> </prop> <node oor:name="Arguments"> <prop oor:name="Command" oor:op="replace" oor:type="xs:string"> - <value>$(prog)/stclient_wrapper</value> + <value>$(progurl)/stclient_wrapper</value> </prop> - <prop oor:name="Arguments" oor:op="replace" oor:type="xs:string"> - <value>-p "${SERVICETAG_PRODUCTNAME}" -e "${SERVICETAG_PRODUCTVERSION}" -t "${SERVICETAG_URN}" -S "${SERVICETAG_SOURCE}" -P "${SERVICETAG_PARENTNAME}"</value> + <prop oor:name="Arguments" oor:op="replace" oor:type="oor:string-list"> + <value oor:separator=";">-p;${SERVICETAG_PRODUCTNAME};-e;${SERVICETAG_PRODUCTVERSION};-t;${SERVICETAG_URN};-S;${SERVICETAG_SOURCE};-P;${SERVICETAG_PARENTNAME};-i;${INSTANCE_URN}</value> </prop> - <prop oor:name="NeedsSystemPathConversion" oor:op="replace" oor:type="xs:boolean"> + <prop oor:name="DeactivateJobIfDone" oor:op="replace" oor:type="xs:boolean"> <value>true</value> </prop> - <prop oor:name="DeactivateJobIfDone" oor:op="replace" oor:type="xs:boolean"> + <prop oor:name="CheckExitCode" oor:op="replace" oor:type="xs:boolean"> <value>true</value> </prop> </node> @@ -58,7 +58,7 @@ <node oor:name="Events"> <node oor:name="OnStartApp" oor:op="fuse"> <node oor:name="JobList"> - <node oor:name="com.sun.star.jobs.stclient" oor:op="fuse" /> + <node oor:name="com.sun.star.jobs.STClient" oor:op="fuse" /> </node> </node> </node> |