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

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

Revision: 9133
          http://octave.svn.sourceforge.net/octave/?rev=9133&view=rev
Author:   prnienhuis
Date:     2011-11-18 14:23:19 +0000 (Fri, 18 Nov 2011)
Log Message:
-----------
Fixed bug in checks for range input argument

Modified Paths:
--------------
    trunk/octave-forge/main/io/inst/oct2ods.m
    trunk/octave-forge/main/io/inst/oct2xls.m

Modified: trunk/octave-forge/main/io/inst/oct2ods.m
===================================================================
--- trunk/octave-forge/main/io/inst/oct2ods.m	2011-11-18 10:32:52 UTC (rev 9132)
+++ trunk/octave-forge/main/io/inst/oct2ods.m	2011-11-18 14:23:19 UTC (rev 9133)
@@ -141,7 +141,7 @@
 	# Check worksheet ptr
 	if (~(ischar (wsh) || isnumeric (wsh))), error ("Integer (index) or text (wsh name) expected for arg # 3"); endif
 	# Check range
-	if (~(isempty (crange) || ischar (crange))), error ("Character string (range) expected for arg # 4"); endif
+	if (~isempty (crange) && ~ischar (crange)), error ("Character string (range) expected for arg # 4"); endif
 	# Various options 
 	if (isempty (spsh_opts))
 		spsh_opts.formulas_as_text = 0;

Modified: trunk/octave-forge/main/io/inst/oct2xls.m
===================================================================
--- trunk/octave-forge/main/io/inst/oct2xls.m	2011-11-18 10:32:52 UTC (rev 9132)
+++ trunk/octave-forge/main/io/inst/oct2xls.m	2011-11-18 14:23:19 UTC (rev 9133)
@@ -139,7 +139,7 @@
 	# Check worksheet ptr
 	if (~(ischar (wsh) || isnumeric (wsh))), error ("Integer (index) or text (wsh name) expected for arg # 3"); endif
 	# Check range
-	if (isempty (crange) || ~ischar (crange)), error ("Character string (range) expected for arg # 4"); endif
+	if (~isempty (crange) && ~ischar (crange)), error ("Character string (range) expected for arg # 4"); endif
 	# Various options 
 	if (isempty (spsh_opts))
 		spsh_opts.formulas_as_text = 0;

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