diff options
| author | Randy Morgan <[email protected]> | 2011-12-14 22:39:07 +0900 |
|---|---|---|
| committer | Randy Morgan <[email protected]> | 2011-12-14 22:39:07 +0900 |
| commit | b633c38b4458c2da6c552e3a20f39e4e29cc98d1 (patch) | |
| tree | 9b47dbfb7a2ef4f79bb7af02821d353a918128ae /lib | |
| parent | 11ba2147c5be473ead38a25b6c44395e81b4cca0 (diff) | |
| download | caxlsx-b633c38b4458c2da6c552e3a20f39e4e29cc98d1.tar.gz caxlsx-b633c38b4458c2da6c552e3a20f39e4e29cc98d1.zip | |
1.0.14 release prep. Beginnings of password protection scheduled for release in Jan. 2012
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/axlsx/version.rb | 2 | ||||
| -rw-r--r-- | lib/axlsx/workbook/worksheet/worksheet.rb | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/axlsx/version.rb b/lib/axlsx/version.rb index 64f350fa..72bb6e99 100644 --- a/lib/axlsx/version.rb +++ b/lib/axlsx/version.rb @@ -1,4 +1,4 @@ module Axlsx # version - VERSION="1.0.13" + VERSION="1.0.14" end diff --git a/lib/axlsx/workbook/worksheet/worksheet.rb b/lib/axlsx/workbook/worksheet/worksheet.rb index 65649cba..41d0f841 100644 --- a/lib/axlsx/workbook/worksheet/worksheet.rb +++ b/lib/axlsx/workbook/worksheet/worksheet.rb @@ -66,7 +66,7 @@ module Axlsx elsif cells.is_a?(Array) cells = cells.sort { |x, y| x.r <=> y.r } "#{cells.first.r}:#{cells.last.r}" - end + end end @@ -279,6 +279,7 @@ module Axlsx # @return [Array] of Cell objects # @param [Array] cells an array of cells def update_auto_fit_data(cells) + # TODO delay this until rendering. too much work when we dont know what they are going to do to the sheet. styles = self.workbook.styles cellXfs, fonts = styles.cellXfs, styles.fonts sz = 11 @@ -301,7 +302,7 @@ module Axlsx # Determines the proper width for a column based on content. # @note - # width = Truncate([!{Number of Characters} * !{Maximum Digit Width} + !{5 pixel padding}]/{Maximum Digit Width}*256)/256 + # width = Truncate([!{Number of Characters} * !{Maximum Digit Width} + !{5 pixel padding}]/!{Maximum Digit Width}*256)/256 # @return [Float] # @param [Hash] A hash of auto_fit_data def auto_width(col) |
