diff options
| -rw-r--r-- | examples/skydrive/real_example.rb | 4 | ||||
| -rw-r--r-- | lib/axlsx/workbook/worksheet/cell.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/skydrive/real_example.rb b/examples/skydrive/real_example.rb index 0274ebe9..ab74fa7f 100644 --- a/examples/skydrive/real_example.rb +++ b/examples/skydrive/real_example.rb @@ -1,4 +1,4 @@ -$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib" +$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../lib" require 'axlsx' @@ -54,7 +54,7 @@ Axlsx::Package.new do |p| chart.start_at 7, 16 chart.end_at 12, 31 end - sheet.merged_cells.concat ["B4:C4","E4:F4","B11:C11","E11:F11","B2:F2"] + %w(B4:C4 E4:F4 B11:C11 E11:F11 B2:F2).each { |range| sheet.merge_cells(range) } sheet.column_widths 2, nil, nil, 2, nil, nil, 2 end end diff --git a/lib/axlsx/workbook/worksheet/cell.rb b/lib/axlsx/workbook/worksheet/cell.rb index ea6746cd..7e0d7916 100644 --- a/lib/axlsx/workbook/worksheet/cell.rb +++ b/lib/axlsx/workbook/worksheet/cell.rb @@ -343,7 +343,7 @@ module Axlsx private def font_size - sz || @styles.fonts[@styles.cellXfs[style].fontId].sz + sz || @styles.fonts[@styles.cellXfs[style].fontId].sz || @styles.fonts[0].sz end # Utility method for setting inline style attributes |