diff options
| author | ochko <[email protected]> | 2012-04-06 17:57:41 +0900 |
|---|---|---|
| committer | ochko <[email protected]> | 2012-04-06 17:57:41 +0900 |
| commit | 289f6718b466cd37bba1afbbb8269ec57b1f8b2f (patch) | |
| tree | 7a539f826788b62f46ed3463d7095def838d5223 /lib | |
| parent | 3431214a4feaa076ebc246552e5e61331d35c398 (diff) | |
| parent | ff5d690f8c3ac8fcab2f9c21d5ddeb699cf0e5ef (diff) | |
| download | caxlsx-289f6718b466cd37bba1afbbb8269ec57b1f8b2f.tar.gz caxlsx-289f6718b466cd37bba1afbbb8269ec57b1f8b2f.zip | |
Merge branch 'master' of git://github.com/randym/axlsx
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/axlsx/workbook/worksheet/worksheet.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/axlsx/workbook/worksheet/worksheet.rb b/lib/axlsx/workbook/worksheet/worksheet.rb index 4f26b568..7aa38866 100644 --- a/lib/axlsx/workbook/worksheet/worksheet.rb +++ b/lib/axlsx/workbook/worksheet/worksheet.rb @@ -402,9 +402,9 @@ module Axlsx str.concat '<sheetData>' @rows.each_with_index { |row, index| row.to_xml_string(index, str) } str.concat '</sheetData>' - page_margins.to_xml_string(str) if @page_margins str.concat "<autoFilter ref='%s'></autoFilter>" % @auto_filter if @auto_filter - str.concat "<mergeCells count='%s'>%s</mergeCells>" % [@merged_cells.size, @merged_cells.reduce('') { |memo, obj| "<mergeCell ref='%s'></mergeCell>" % obj } ] unless @merged_cells.empty? + str.concat "<mergeCells count='%s'>%s</mergeCells>" % [@merged_cells.size, @merged_cells.reduce('') { |memo, obj| memo += "<mergeCell ref='%s'></mergeCell>" % obj } ] unless @merged_cells.empty? + page_margins.to_xml_string(str) if @page_margins str.concat "<drawing r:id='rId1'></drawing>" if @drawing unless @tables.empty? str.concat "<tableParts count='%s'>%s</tableParts>" % [@tables.size, @tables.reduce('') { |memo, obj| memo += "<tablePart r:id='%s'/>" % obj.rId }] |