summaryrefslogtreecommitdiff
path: root/bean/com/sun
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2012-01-11 19:21:33 +0100
committerAndras Timar <atimar@suse.com>2012-01-11 19:25:45 +0100
commitaab14cb9fbc7d82b804a89e4cc61fb874c8636c8 (patch)
tree06076784fd47291174d9d51811da496191ae5cf4 /bean/com/sun
parent8a3b584528e30f346cbab34141ee088eea16020c (diff)
fix prefix of command line switches (-- instead of -)
Diffstat (limited to 'bean/com/sun')
-rw-r--r--bean/com/sun/star/beans/LocalOfficeConnection.java8
-rw-r--r--bean/com/sun/star/comp/beans/LocalOfficeConnection.java12
-rw-r--r--bean/com/sun/star/comp/beans/OOoBean.java4
3 files changed, 12 insertions, 12 deletions
diff --git a/bean/com/sun/star/beans/LocalOfficeConnection.java b/bean/com/sun/star/beans/LocalOfficeConnection.java
index fc098c381a15..443941cc431d 100644
--- a/bean/com/sun/star/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/beans/LocalOfficeConnection.java
@@ -588,13 +588,13 @@ public class LocalOfficeConnection
// create call with arguments
String[] cmdArray = new String[4];
cmdArray[0] = (new File(getProgramPath(), OFFICE_APP_NAME)).getPath();
- cmdArray[1] = "-nologo";
- cmdArray[2] = "-nodefault";
+ cmdArray[1] = "--nologo";
+ cmdArray[2] = "--nodefault";
if ( mConnType.equals( "pipe" ) )
- cmdArray[3] = "-accept=pipe,name=" + getIdentifier() + ";" +
+ cmdArray[3] = "--accept=pipe,name=" + getIdentifier() + ";" +
mProtocol + ";" + mInitialObject;
else if ( mConnType.equals( "socket" ) )
- cmdArray[3] = "-accept=socket,port=" + mPort + ";urp";
+ cmdArray[3] = "--accept=socket,port=" + mPort + ";urp";
else
throw new java.io.IOException( "not connection specified" );
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
index cc7545ad3e22..bb6abdd53195 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -747,8 +747,8 @@ public class LocalOfficeConnection
//examine if user specified command-line options in system properties.
//We may offer later a more sophisticated way of providing options if
//the need arises. Currently this is intended to ease the pain during
- //development with pre-release builds of OOo where one wants to start
- //OOo with the -norestore options. The value of the property is simple
+ //development with pre-release builds of LibO where one wants to start
+ //LibO with the --norestore options. The value of the property is simple
//passed on to the Runtime.exec call.
try {
sOption = System.getProperty("com.sun.star.officebean.Options");
@@ -768,13 +768,13 @@ public class LocalOfficeConnection
// cmdArray[0] = (new File(getProgramPath(), OFFICE_APP_NAME)).getPath();
cmdArray[0] = (new File(unoPath, OFFICE_APP_NAME)).getPath();
- cmdArray[1] = "-nologo";
- cmdArray[2] = "-nodefault";
+ cmdArray[1] = "--nologo";
+ cmdArray[2] = "--nodefault";
if ( mConnType.equals( "pipe" ) )
- cmdArray[3] = "-accept=pipe,name=" + getIdentifier() + ";" +
+ cmdArray[3] = "--accept=pipe,name=" + getIdentifier() + ";" +
mProtocol + ";" + mInitialObject;
else if ( mConnType.equals( "socket" ) )
- cmdArray[3] = "-accept=socket,port=" + mPort + ";urp";
+ cmdArray[3] = "--accept=socket,port=" + mPort + ";urp";
else
throw new java.io.IOException( "not connection specified" );
diff --git a/bean/com/sun/star/comp/beans/OOoBean.java b/bean/com/sun/star/comp/beans/OOoBean.java
index 3ea15f044d20..7cba97e2ee3a 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -800,12 +800,12 @@ public class OOoBean
when at the same time the office writes a backup of the document. This bug
also affects {@link #storeToByteArray storeToByteArray} and
{@link #storeToStream storeToStream}. The workaround
- is to start the office with the option -norestore, which disables the automatic
+ is to start the office with the option --norestore, which disables the automatic
backup and recovery mechanism. OOoBean offers currently no supported way of providing
startup options for OOo. But it is possible to set a Java property when starting
Java, which is examined by OOoBean:
<pre>
- java -Dcom.sun.star.officebean.Options=-norestore ...
+ java -Dcom.sun.star.officebean.Options=--norestore ...
</pre>
It is planned to offer a way of specifying startup options in a future version.
The property can be used until then. When using this property only one option