incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From liu...@apache.org
Subject svn commit: r1359958 - /incubator/ooo/trunk/main/test/testcommon/source/org/openoffice/test/OpenOffice.java
Date Wed, 11 Jul 2012 00:09:31 GMT
Author: liuzhe
Date: Wed Jul 11 00:09:31 2012
New Revision: 1359958

URL: http://svn.apache.org/viewvc?rev=1359958&view=rev
Log:
The default OpenOffice home is wrong on Mac OS X & Windows. Fixed it.

Modified:
    incubator/ooo/trunk/main/test/testcommon/source/org/openoffice/test/OpenOffice.java

Modified: incubator/ooo/trunk/main/test/testcommon/source/org/openoffice/test/OpenOffice.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testcommon/source/org/openoffice/test/OpenOffice.java?rev=1359958&r1=1359957&r2=1359958&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testcommon/source/org/openoffice/test/OpenOffice.java (original)
+++ incubator/ooo/trunk/main/test/testcommon/source/org/openoffice/test/OpenOffice.java Wed
Jul 11 00:09:31 2012
@@ -77,8 +77,10 @@ public class OpenOffice {
 		if (appHome == null) {
 			if (SystemUtil.isWindows()) {
 				appHome = "C:/Program Files/OpenOffice.org 3/program";
+				if (!new File(appHome).exists())
+					appHome = "C:/Program Files (x86)/OpenOffice.org 3/program";
 			} else if (SystemUtil.isMac()) {
-				appHome = "/Applications/OpenOffice.org/Contents/MacOS";
+				appHome = "/Applications/OpenOffice.org.app/Contents/MacOS";
 			} else {
 				appHome = "/opt/openoffice.org3/program";
 			}



Mime
View raw message