Mercurial > forge

changeset 11643:4c9a22aa2e70 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert 11821 and replace by improved xls/xlsx suffix check
author prnienhuis
date Sun, 21 Apr 2013 17:52:00 +0000
parents 02420aa54b0b
children eb48ca3b21a1
files main/io/inst/xlswrite.m
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/main/io/inst/xlswrite.m	Sun Apr 21 17:50:35 2013 +0000
+++ b/main/io/inst/xlswrite.m	Sun Apr 21 17:52:00 2013 +0000
@@ -110,6 +110,7 @@
 ## 2012-10-24 Style fixes
 ## 2012-12-23 Fix rare occasion of xlsclose error in unwind_protect block
 ## 2012-04-17 Fix checks on xls or xls? suffix (due to Vermylen)
+## 2012-04-21 Improve xls/xlsx suffix check
 
 function [ rstatus ] = xlswrite (filename, arr, arg3, arg4, arg5)
 
@@ -123,7 +124,7 @@
   elseif (nargin == 2)
     ## Assume first worksheet and full worksheet starting at A1
     wsh = 1;
-    if (strcmpi (filename(end-3:end-1), "xls"))
+    if (strcmpi (filename(end-4:end-1), ".xls"))
       crange = "A1:XFD1048576";   ## OOXML has ridiculously large limits 
     else
       crange = "A1:IV65536";      ## Regular xls limits
@@ -133,7 +134,7 @@
     if (isnumeric (arg3) || (isempty (findstr (arg3, ":")) && ~isempty (arg3)))
       ## Apparently a worksheet specified
       wsh = arg3;
-      if (strcmpi (filename(end-3:end-1), "xls"))
+      if (strcmpi (filename(end-4:end-1), ".xls"))
         crange = "A1:XFD1048576"; ## OOXML has ridiculously large limits 
       else
         crange = "A1:IV65536";    ## Regular xls limits