Mercurial > forge

changeset 11642:02420aa54b0b octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert 11821 for xlsopen.m
author prnienhuis
date Sun, 21 Apr 2013 17:50:35 +0000
parents 656eae967c61
children 4c9a22aa2e70
files main/io/inst/xlsopen.m
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/main/io/inst/xlsopen.m	Sun Apr 21 17:46:50 2013 +0000
+++ b/main/io/inst/xlsopen.m	Sun Apr 21 17:50:35 2013 +0000
@@ -124,6 +124,7 @@
 ## 2012-03-01 Revamped logic for determining if file type is supported by a
 ##            particular interface
 ## 2012-04-17 Fix checks on xls or xls? suffix (due to Vermylen)
+## 2012-04-21 Revert xls/xlsx type check (was good as it stood)
 
 function [ xls ] = xlsopen (filename, xwrite=0, reqinterface=[])
 
@@ -229,8 +230,8 @@
   xlsinterfaces = getxlsinterfaces (xlsinterfaces);
 
   ## Supported interfaces determined; Excel file type check moved to separate interfaces.
-  chk1 = strcmpi (filename(end-2:end), '.xls');      ## Regular (binary) BIFF 
-  chk2 = strcmpi (filename(end-3:end-1), '.xls');    ## Zipped XML / OOXML
+  chk1 = strcmpi (filename(end-3:end), '.xls');      ## Regular (binary) BIFF 
+  chk2 = strcmpi (filename(end-4:end-1), '.xls');    ## Zipped XML / OOXML
   
   ## Initialize file ptr struct
   xls = struct ("xtype",    'NONE',