[Octave-cvsupdate] SF.net SVN: octave:[8047] trunk/octave-forge/main/io/inst

[<prn...@us...>]

Revision: 8047
          http://octave.svn.sourceforge.net/octave/?rev=8047&view=rev
Author:   prnienhuis
Date:     2011-01-03 20:39:19 +0000 (Mon, 03 Jan 2011)

Log Message:
-----------
Updates & corrections to info header text

Modified Paths:
--------------
    trunk/octave-forge/main/io/inst/ods2oct.m
    trunk/octave-forge/main/io/inst/odsopen.m
    trunk/octave-forge/main/io/inst/xlsopen.m

Modified: trunk/octave-forge/main/io/inst/ods2oct.m
===================================================================
--- trunk/octave-forge/main/io/inst/ods2oct.m	2011-01-03 20:37:55 UTC (rev 8046)
+++ trunk/octave-forge/main/io/inst/ods2oct.m	2011-01-03 20:39:19 UTC (rev 8047)
@@ -21,7 +21,7 @@
 ## @deftypefnx {Function File} [ @var{rawarr}, @var{ods}, @var{rstatus} ] = ods2oct (@var{ods}, @var{wsh}, @var{range}, @var{options})
 ##
 ## Read data contained within range @var{range} from worksheet @var{wsh}
-## in an OpenOffice.org spreadsheet file pointed to in struct @var{ods}.
+## in an OpenOffice_org spreadsheet file pointed to in struct @var{ods}.
 ##
 ## @var{wsh} is either numerical or text, in the latter case it is 
 ## case-sensitive and it may be max. 31 characters long.
@@ -111,6 +111,7 @@
 ## 2010-08-27 Added ods3jotk2oct - internal function for odfdom-0.8.6.jar
 ##      "     Extended check on spsh_opts (must be a struct) 
 ## 2010-10-27 Moved cropping rawarr from empty outer rows & columns to here
+## 2010-12-06 Textual changes to info header 
 ##
 ## (Latest update of subfunctions below: 2010-11-13)
 

Modified: trunk/octave-forge/main/io/inst/odsopen.m
===================================================================
--- trunk/octave-forge/main/io/inst/odsopen.m	2011-01-03 20:37:55 UTC (rev 8046)
+++ trunk/octave-forge/main/io/inst/odsopen.m	2011-01-03 20:39:19 UTC (rev 8047)
@@ -19,7 +19,7 @@
 ## @deftypefnx {Function File} @var{ods} = odsopen (@var{filename}, @var{readwrite})
 ## @deftypefnx {Function File} @var{ods} = odsopen (@var{filename}, @var{readwrite}, @var{reqintf})
 ## Get a pointer to an OpenOffice_org spreadsheet in the form of return
-## argument @var{ods}.
+## argument (file pointer struct) @var{ods}.
 ##
 ## Calling odsopen without specifying a return argument is fairly useless!
 ##
@@ -76,6 +76,7 @@
 ## 2010-10-27 Improved tracking of file changes tru ods.changed
 ## 2010-11-12 Small changes to help text
 ##     "      Added try-catch to file open sections to create fallback to other intf
+## 2010-12-06 Textual changes to info header 
 ##
 ## Latest change on subfunction below: 2010-09-27
 

Modified: trunk/octave-forge/main/io/inst/xlsopen.m
===================================================================
--- trunk/octave-forge/main/io/inst/xlsopen.m	2011-01-03 20:37:55 UTC (rev 8046)
+++ trunk/octave-forge/main/io/inst/xlsopen.m	2011-01-03 20:39:19 UTC (rev 8047)
@@ -19,8 +19,8 @@
 ## @deftypefnx {Function File} @var{xls} = xlsopen (@var{filename}, @var{readwrite})
 ## @deftypefnx {Function File} @var{xls} = xlsopen (@var{filename}, @var{readwrite}, @var{reqintf})
 ## Get a pointer to an Excel spreadsheet in the form of return argument
-## @var{xls}. After processing the spreadsheet, the file pointer must be
-## explicitly closed calling xlsclose().
+## (file pointer struct) @var{xls}. After processing the spreadsheet,
+## the file pointer must be explicitly closed by calling xlsclose().
 ##
 ## Calling xlsopen without specifying a return argument is fairly useless!
 ##
@@ -87,6 +87,8 @@
 ## 2010-11-05 Slight change to reporting to screen
 ## 2010-11-08 Tested with POI 3.7 (OK)
 ## 2010-11-10 Texinfo header updated
+## 2010-12-01 Small bugfix - reset xlssupport in l. 102
+## 2010-12-06 Textual changes to info header 
 ##
 ## 2010-11-05 Latest subfunction update
 
@@ -98,6 +100,7 @@
 		xlsinterfaces = struct ( "COM", [], "POI", [], "JXL", [] );
 		chkintf = 1;
 	endif
+	xlssupport = 0;
 
 	if (nargout < 1)
 		usage ("XLS = xlsopen (Xlfile [, Rw] [, reqintf]). But no return argument specified!"); 
@@ -106,7 +109,7 @@
 		usage ("Numerical or logical value expected for arg # 2")
 	endif
 	if (~isempty (reqinterface))
-		if ~(ischar (reqinterface) || iscell(reqinterface)), usage ("Arg # 3 not recognized"); endif
+		if ~(ischar (reqinterface) || iscell (reqinterface)), usage ("Arg # 3 not recognized"); endif
 		# Turn arg3 into cell array if needed
 		if (~iscell (reqinterface)), reqinterface = {reqinterface}; endif
 		xlsinterfaces.COM = 0; xlsinterfaces.POI = 0; xlsinterfaces.JXL = 0;
@@ -121,7 +124,7 @@
 			elseif (strcmp (reqintf, 'JXL'))
 				xlsinterfaces.JXL = [];
 			else 
-				usage (sprintf ("Unknown .xls interface \"%s\" requested. Only COM, POI or JXL supported", reqinterface{}));
+				usage (sprintf ("Unknown .xls interface \"%s\" requested. Only COM, POI or JXL supported\n", reqinterface{}));
 			endif
 		endfor
 		printf ("Checking interface(s):\n");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.