lib/roo/excelx.rb in roo-1.9.0 vs lib/roo/excelx.rb in roo-1.9.1

@@ -282,11 +282,11 @@
   def excelx_format(row,col,sheet=nil)
     sheet = @default_sheet unless sheet
     read_cells(sheet) unless @cells_read[sheet]
     row,col = normalize(row,col)
     s = @s_attribute[sheet][[row,col]]
-    result = attribute2format(s)
+    result = attribute2format(s).to_s
     result
   end
   
   # returns an array of sheet names in the spreadsheet
   def sheets
@@ -551,11 +551,12 @@
     #TODO: doc.find("//*[local-name()='si']").each do |si|
     doc.xpath("//*[local-name()='si']").each do |si|
       shared_table_entry = ''
       #TODO:  si.each_element do |elem|
       si.children.each do |elem|
-        if elem.name == 'r'
-          elem.each_element do |r_elem|
+        if elem.name == 'r' and elem.children
+          # elem.each_element do |r_elem|
+          elem.children.each do |r_elem|
             if r_elem.name == 't'
               shared_table_entry << r_elem.content
             end
           end
         end