summaryrefslogtreecommitdiffhomepage
path: root/lib
diff options
context:
space:
mode:
authorStefan Daschek <[email protected]>2012-05-15 20:04:35 +0200
committerStefan Daschek <[email protected]>2012-05-15 20:04:35 +0200
commit80252d12123118f2ebbd9736931f3c0150cf1653 (patch)
tree369e496714d95748cf6e1783b9432e64bf236617 /lib
parent9237511af7a89dca97b4583bba41cd15317f25ec (diff)
downloadcaxlsx-80252d12123118f2ebbd9736931f3c0150cf1653.tar.gz
caxlsx-80252d12123118f2ebbd9736931f3c0150cf1653.zip
Worksheet#merge_cells sometimes produced invalid merge ranges when given an array of cells.
Merging e.g. cells A9 and A10 resulted in invalid range "A10:A9".
Diffstat (limited to 'lib')
-rw-r--r--lib/axlsx/workbook/worksheet/worksheet.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/axlsx/workbook/worksheet/worksheet.rb b/lib/axlsx/workbook/worksheet/worksheet.rb
index 2205b97d..887968e0 100644
--- a/lib/axlsx/workbook/worksheet/worksheet.rb
+++ b/lib/axlsx/workbook/worksheet/worksheet.rb
@@ -204,7 +204,7 @@ module Axlsx
@merged_cells << if cells.is_a?(String)
cells
elsif cells.is_a?(Array)
- cells = cells.sort { |x, y| x.r <=> y.r }
+ cells = cells.sort { |x, y| [x.index, x.row.index] <=> [y.index, y.row.index] }
"#{cells.first.r}:#{cells.last.r}"
end
end