From f6bfd71bc32ddf3d52cd9048031268012669af6d Mon Sep 17 00:00:00 2001
From: Todd Hanson <todd@termsync.com>
Date: Tue, 27 Oct 2020 12:42:21 -0500
Subject: [PATCH 1/2] Add support for implicit cell coordinates

---
 lib/roo/excelx/sheet_doc.rb | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/lib/roo/excelx/sheet_doc.rb b/lib/roo/excelx/sheet_doc.rb
index adbb77a8..7a09725a 100755
--- a/lib/roo/excelx/sheet_doc.rb
+++ b/lib/roo/excelx/sheet_doc.rb
@@ -211,10 +211,19 @@ def extract_cells(relationships)
         extracted_cells = {}
         empty_cell = @options[:empty_cell]
 
-        doc.xpath('/worksheet/sheetData/row/c').each do |cell_xml|
-          coordinate = ::Roo::Utils.extract_coordinate(cell_xml["r"])
-          cell = cell_from_xml(cell_xml, hyperlinks(relationships)[coordinate], coordinate, empty_cell)
-          extracted_cells[coordinate] = cell if cell
+        doc.xpath('/worksheet/sheetData/row').each.with_index(1) do |row_xml, ycoord|
+          row_xml.xpath('c').each.with_index(1) do |cell_xml, xcoord|
+            r = cell_xml['r']
+            coordinate =
+              if r.nil?
+                ::Roo::Excelx::Coordinate.new(ycoord, xcoord)
+              else
+                ::Roo::Utils.extract_coordinate(r)
+              end
+
+            cell = cell_from_xml(cell_xml, hyperlinks(relationships)[coordinate], coordinate, empty_cell)
+            extracted_cells[coordinate] = cell if cell
+          end
         end
 
         expand_merged_ranges(extracted_cells) if @options[:expand_merged_ranges]

From 5eb8a8aca4a002c972ae2d941ece3eb06ceb7026 Mon Sep 17 00:00:00 2001
From: Todd Hanson <todd@termsync.com>
Date: Tue, 27 Oct 2020 17:11:53 -0500
Subject: [PATCH 2/2] Add test for implicit cell coordinates

---
 test/files/implicit_coordinates.xlsx | Bin 0 -> 4405 bytes
 test/roo/test_excelx.rb              |   9 +++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 test/files/implicit_coordinates.xlsx

diff --git a/test/files/implicit_coordinates.xlsx b/test/files/implicit_coordinates.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..039d0187a95bb38b45ee46be69f0ab2c94c5ddad
GIT binary patch
literal 4405
zcmb7IXHZjX*F6|o2)#GyRaz*5G`WIw=^dnqBB5jGEpRC!ND(9m8bG?V3n-}cj?%6a
z0|E*n0i_u!(#sq4z6uw=&w1y}WKMoOYu4<w_OsVM`r06TS^xlu0c5e2!CU-laZ5Y^
zFe3l}8h{nBQt@#2c5wH$H4gA}@Uj;5cXKr{1_Pi#bee7aoitk?e+YnwUt`?N@eQQG
zxJS1QN?E@l#AR!+m<m!BaH3F1(2s$u@lEg)EUP@V8f$XQP&PqI(Q$paHd-h7L^3s_
zPr6uh_<g;U96ya5ANW%%aZw4XUYKprMdCri<Bs8Qy$Z7()N9T+ES<py5g#&{A<RPg
zH)4t2*2Y@c2nP@>!WA0rqXzK2HB>MhLyP2Ejn2yOrk3dp(N;}(-NJ1{*{Naa$M5la
zgiS5@|GqFC6y_q5P@vt!mwU@KC|IPd>0Ftej}H%ri8uYLIw~xEEvFlvxE|xPyQh+6
z{ic$HT<yvSz`3BEIm0oj#kS`&55%>{*n^_)3u;@0K|8cKBLf%0AhsZUbiZ$Ytagan
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

literal 0
HcmV?d00001

diff --git a/test/roo/test_excelx.rb b/test/roo/test_excelx.rb
index 61161f07..c90cd8c0 100644
--- a/test/roo/test_excelx.rb
+++ b/test/roo/test_excelx.rb
@@ -341,6 +341,15 @@ def test_parsing_xlsx_with_richtext
     assert_equal "Example richtext", xlsx.cell("b", 1)
   end
 
+  def test_implicit_coordinates
+    xlsx = roo_class.new(File.join(TESTDIR, 'implicit_coordinates.xlsx'))
+
+    assert_equal 'Test', xlsx.cell('a', 1)
+    assert_equal 'A2', xlsx.cell('a', 2)
+    assert_equal 'B2', xlsx.cell(2, 2)
+    assert_equal 'C2', xlsx.cell('c', 2)
+  end
+
   def roo_class
     Roo::Excelx
   end