# HG changeset patch
# User prnienhuis
# Date 1395182078 0
# Node ID b93aabf83e77dabc613c97263a948702ce45b5a4
# Parent  8f8a0e5187520db9142d4d2f32711af998a62811
Reinstate SheetId (rather than rId) in file ptr (was used somewhere after all)

diff -r 8f8a0e518752 -r b93aabf83e77 main/io/inst/private/__OCT_spsh_open__.m
--- a/main/io/inst/private/__OCT_spsh_open__.m	Tue Mar 18 22:33:24 2014 +0000
+++ b/main/io/inst/private/__OCT_spsh_open__.m	Tue Mar 18 22:34:38 2014 +0000
@@ -43,7 +43,8 @@
 ## 2014-01-29 Support for xlsx and gnumeric
 ## 2014-02-08 Fix wrong function name in error msg (couldn't be unzipped)
 ## 2014-03-17 Simplify sheet names discovery
-##     ''     Ignore SheetId (nowhere used)
+##     ''     Ignore SheetId (nowhere used)
+## 2014-03-18 Reinstate SheetId (was used somewhere after all)
 
 function [ xls, xlssupport, lastintf] = __OCT_spsh_open__ (xls, xwrite, filename, xlssupport, ftype)
 
@@ -111,7 +112,8 @@
       ## Get sheet names and indices
       sheets = getxmlnode (xml, "sheets", [], 1);
       xls.sheets.sh_names = cell2mat (regexp (sheets, '<sheet name="(.*?)"', "tokens"));
-##    xls.sheets.rid = str2double (cell2mat (regexp (sheets, ' r:id="rId(\d+)"', "tokens")));
+      xls.sheets.rid = str2double (cell2mat (regexp (sheets, ' r:id="rId(\d+)"', "tokens")));
+      xls.sheets.sheetid = str2double (cell2mat (regexp (sheets, ' sheetId="(\d+)"', "tokens")));
 
     endif