summaryrefslogtreecommitdiffhomepage
path: root/lib/axlsx/workbook/worksheet/merged_cells.rb
diff options
context:
space:
mode:
authorJurriaan Pruis <[email protected]>2014-01-15 23:44:02 +0100
committerJurriaan Pruis <[email protected]>2014-02-26 20:09:21 +0100
commitbe8e00332c73439cf17083173ea74f1505100df9 (patch)
tree383ec2e23fc0a14aa5ad90e139648a79814eeded /lib/axlsx/workbook/worksheet/merged_cells.rb
parenta271a7d0f26ecb26d01aad00e094744d6fe8b0d2 (diff)
downloadcaxlsx-be8e00332c73439cf17083173ea74f1505100df9.tar.gz
caxlsx-be8e00332c73439cf17083173ea74f1505100df9.zip
Huge refactoring
Do not create huge strings Let Row inherit from SimpleTypedList Optimized sanitizing Optimized validation And more..
Diffstat (limited to 'lib/axlsx/workbook/worksheet/merged_cells.rb')
-rw-r--r--lib/axlsx/workbook/worksheet/merged_cells.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/axlsx/workbook/worksheet/merged_cells.rb b/lib/axlsx/workbook/worksheet/merged_cells.rb
index 8850e295..6ea1edc9 100644
--- a/lib/axlsx/workbook/worksheet/merged_cells.rb
+++ b/lib/axlsx/workbook/worksheet/merged_cells.rb
@@ -15,7 +15,7 @@ module Axlsx
# collection. This can be an array of actual cells or a string style
# range like 'A1:C1'
def add(cells)
- @list << if cells.is_a?(String)
+ self << if cells.is_a?(String)
cells
elsif cells.is_a?(Array)
Axlsx::cell_range(cells, false)
@@ -26,7 +26,7 @@ module Axlsx
# @param [String] str
# @return [String]
def to_xml_string(str = '')
- return if @list.empty?
+ return if empty?
str << "<mergeCells count='#{size}'>"
each { |merged_cell| str << "<mergeCell ref='#{merged_cell}'></mergeCell>" }
str << '</mergeCells>'