mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OfficeInstallation is now a separate class.

Browse Source
This commit is contained in:
Tomas O'Connor
2003-02-20 11:00:21 +00:00
parent d18c4ef357
commit 341939f274
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripting/java/org/openoffice/netbeans/modules/office/actions/OfficeDocumentSupport.java
View File

@@ -2,9 +2,9 @@
*
* $RCSfile: OfficeDocumentSupport.java,v $
*
* $Revision: 1.3 $
* $Revision: 1.4 $
*
* last change: $Author: toconnor $ $Date: 2003-01-28 20:52:33 $
* last change: $Author: toconnor $ $Date: 2003-02-20 12:00:21 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -125,8 +125,8 @@ public class OfficeDocumentSupport implements OfficeDocumentCookie, OpenCookie,
File file = FileUtil.toFile(dataObj.getPrimaryFile());
OfficeSettings settings = OfficeSettings.getDefault();
File soffice = new File(settings.getOfficeDirectory() +
File.separator + "soffice");
File soffice = new File(settings.getOfficeDirectory().getPath(
File.separator + "soffice"));
try {
Process p = Runtime.getRuntime ().exec (new String[] {

8
scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderSupport.java
View File

@@ -2,9 +2,9 @@
*
* $RCSfile: ParcelFolderSupport.java,v $
*
* $Revision: 1.7 $
* $Revision: 1.8 $
*
* last change: $Author: toconnor $ $Date: 2003-02-12 12:40:19 $
* last change: $Author: toconnor $ $Date: 2003-02-20 12:00:21 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -224,8 +224,8 @@ public class ParcelFolderSupport implements ParcelFolderCookie
result.addElement(tokens.nextToken());
OfficeSettings settings = OfficeSettings.getDefault();
File classesDir = new File(settings.getOfficeDirectory() +
File.separator + "program" + File.separator + "classes");
File classesDir = new File(settings.getOfficeDirectory().getPath(
File.separator + "program" + File.separator + "classes"));
File[] jarfiles = classesDir.listFiles();
for (int i = 0; i < jarfiles.length; i++)

10
scripting/java/org/openoffice/netbeans/modules/office/utils/ManifestParser.java
View File

@@ -2,9 +2,9 @@
*
* $RCSfile: ManifestParser.java,v $
*
* $Revision: 1.3 $
* $Revision: 1.4 $
*
* last change: $Author: toconnor $ $Date: 2003-01-16 11:42:48 $
* last change: $Author: toconnor $ $Date: 2003-02-20 11:56:59 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -75,7 +75,7 @@ import org.openide.xml.XMLUtil;
import org.openoffice.netbeans.modules.office.options.OfficeSettings;
import org.openoffice.idesupport.xml.XMLParser;
import org.openoffice.idesupport.SVersionRCFile;
import org.openoffice.idesupport.OfficeInstallation;
public class ManifestParser implements XMLParser {
@@ -99,9 +99,7 @@ public class ManifestParser implements XMLParser {
Document result = null;
try {
SVersionRCFile.OfficeInstallation oi =
new SVersionRCFile.OfficeInstallation(
OfficeSettings.getDefault().getOfficeDirectory());
OfficeInstallation oi = OfficeSettings.getDefault().getOfficeDirectory();
String id = oi.getURL("share/dtd/officedocument/1_0/");
is = new InputSource(inputStream);