changeset 6971:4f232cd89aaa octave-forge

Improved help text (one doesn't strictly need OTK *or* JOD but can have both. Though the latter only matters when odfdom 0.8 is used, as that has no write support in octave while JOD has (somewhat)).
author prnienhuis
date Tue, 06 Apr 2010 18:58:43 +0000
parents 6c225f7615cb
children 5b035b8cebe9
files main/io/inst/odsopen.m
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/main/io/inst/odsopen.m	Mon Apr 05 09:11:31 2010 +0000
+++ b/main/io/inst/odsopen.m	Tue Apr 06 18:58:43 2010 +0000
@@ -24,7 +24,7 @@
 ## Calling odsopen without specifying a return argument is fairly useless!
 ##
 ## To make this function work at all, you need the Java package > 1.2.6 plus
-## either ODFtoolkit version 0.7.5 & xercesImpl, or jOpenDocument installed on your
+## ODFtoolkit version 0.7.5 & xercesImpl, and/or jOpenDocument installed on your
 ## computer + proper javaclasspath set. These interfaces are referred to as
 ## OTK and JOD, resp., and are preferred in that order by default (depending
 ## on their presence).
@@ -237,7 +237,7 @@
 			# in class path. Under *nix the classpath must first be split up
 			if (isunix) tmp1 = strsplit (char(tmp1), ":"); endif
 			if (size (tmp1, 1) > size (tmp1,2)) tmp1 = tmp1'; endif
-			jpchk = 0; entries = {"odfdom.jar", "xercesImpl.jar"};
+			jpchk = 0; entries = {"odfdom", "xercesImpl.jar"};
 			for ii=1:size (tmp1, 2)
 				tmp2 = strsplit (char (tmp1(1, ii)), "\\/");
 				for jj=1:size (entries, 2)