summaryrefslogtreecommitdiff
path: root/qadevOOo/runner/helper/OfficeProvider.java
diff options
context:
space:
mode:
authorSvante Schubert <sus@openoffice.org>2003-07-01 13:28:07 +0000
committerSvante Schubert <sus@openoffice.org>2003-07-01 13:28:07 +0000
commitd2da83b05c6d4bdd3dea78924e44f597fc9f0dcc (patch)
tree89a6c537e6545af590d8e0ae1502ff0f515deb7a /qadevOOo/runner/helper/OfficeProvider.java
parent3052085fdc97a0d8046f89789f18a93b55c1a72a (diff)
./ added as prefix for the configure command
Diffstat (limited to 'qadevOOo/runner/helper/OfficeProvider.java')
-rw-r--r--qadevOOo/runner/helper/OfficeProvider.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/qadevOOo/runner/helper/OfficeProvider.java b/qadevOOo/runner/helper/OfficeProvider.java
index 875e2347d9c5..510660acd9f7 100644
--- a/qadevOOo/runner/helper/OfficeProvider.java
+++ b/qadevOOo/runner/helper/OfficeProvider.java
@@ -2,9 +2,9 @@
*
* $RCSfile: OfficeProvider.java,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change:$Date: 2003-06-11 16:24:48 $
+ * last change:$Date: 2003-07-01 14:28:07 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -209,12 +209,8 @@ public class OfficeProvider implements AppProvider {
boolean alreadyConnected = (msf != null);
if (alreadyConnected) {
ProcessHandler ph = (ProcessHandler) param.get("AppProvider");
- if (ph == null) {
- if(closeIfPossible)
- return disposeOffice(msf);
- }
- else {
- ph.kill();
+ if (ph != null) {
+ disposeOffice(msf);
// dispose watcher in case it's still running.
int timeOut = param.getInt("TimeOut");
if (timeOut==0) {
@@ -226,6 +222,10 @@ public class OfficeProvider implements AppProvider {
}
return true;
}
+ else {
+ if(closeIfPossible)
+ return disposeOffice(msf);
+ }
}
else {
String cncstr = "uno:"+param.get("ConnectionString")+