diff options
| author | Randy Morgan <[email protected]> | 2012-05-17 20:37:28 +0900 |
|---|---|---|
| committer | Randy Morgan <[email protected]> | 2012-05-17 20:37:28 +0900 |
| commit | c8b40481b1ab947fbb783657e19749b59b716cfe (patch) | |
| tree | 72c750aae7ef92627fdf3e2fdf53e2199270404f /lib | |
| parent | 0297bd574791ac7781352c20db2eeaa2c1cea3f3 (diff) | |
| download | caxlsx-c8b40481b1ab947fbb783657e19749b59b716cfe.tar.gz caxlsx-c8b40481b1ab947fbb783657e19749b59b716cfe.zip | |
fix ALL the warnings!
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/axlsx/workbook/worksheet/cell.rb | 2 | ||||
| -rw-r--r-- | lib/axlsx/workbook/worksheet/worksheet.rb | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/axlsx/workbook/worksheet/cell.rb b/lib/axlsx/workbook/worksheet/cell.rb index 2684af75..745809f9 100644 --- a/lib/axlsx/workbook/worksheet/cell.rb +++ b/lib/axlsx/workbook/worksheet/cell.rb @@ -195,7 +195,7 @@ module Axlsx # @option options [Symbol] scheme must be one of :none, major, :minor def initialize(row, value="", options={}) self.row=row - @font_name = @charset = @family = @b = @i = @strike = @outline = @shadow = nil + @value = @font_name = @charset = @family = @b = @i = @strike = @outline = @shadow = nil @condense = @u = @vertAlign = @sz = @color = @scheme = @extend = @ssti = nil @styles = row.worksheet.workbook.styles @row.cells << self diff --git a/lib/axlsx/workbook/worksheet/worksheet.rb b/lib/axlsx/workbook/worksheet/worksheet.rb index 854e629c..b104b054 100644 --- a/lib/axlsx/workbook/worksheet/worksheet.rb +++ b/lib/axlsx/workbook/worksheet/worksheet.rb @@ -488,12 +488,12 @@ module Axlsx str.concat "<drawing r:id='rId1'></drawing>" if @drawing str << '<legacyDrawing r:id="rId1"/>' if @comments.size > 0 unless @tables.empty? - str.concat "<tableParts count='%s'>%s</tableParts>" % [@tables.size, @tables.reduce('') { |memo, obj| memo += "<tablePart r:id='%s'/>" % obj.rId }] - end - @conditional_formattings.each do |cf| - str.concat cf.to_xml_string - end - str + '</worksheet>' + str.concat "<tableParts count='%s'>%s</tableParts>" % [@tables.size, @tables.reduce('') { |memo, obj| memo += "<tablePart r:id='%s'/>" % obj.rId }] + end + @conditional_formattings.each do |cf| + str.concat cf.to_xml_string + end + str + '</worksheet>' end # The worksheet relationships. This is managed automatically by the worksheet |
