diff options
| author | ochko <[email protected]> | 2011-12-16 18:49:17 +0900 |
|---|---|---|
| committer | ochko <[email protected]> | 2011-12-16 18:49:17 +0900 |
| commit | 1fb348ea888b9b5bec92606ebaedd61154001e2e (patch) | |
| tree | 5a88fd16fe73912ce0471227aeb143e1e3cd1632 | |
| parent | b6b2cce467f37b6a3ebfea668604bb9ec2f00f09 (diff) | |
| parent | 0143835085fae316d9b0177d0353149cb3f84386 (diff) | |
| download | caxlsx-1fb348ea888b9b5bec92606ebaedd61154001e2e.tar.gz caxlsx-1fb348ea888b9b5bec92606ebaedd61154001e2e.zip | |
Merge branch 'master' of git://github.com/randym/axlsx
| -rw-r--r-- | lib/axlsx/stylesheet/styles.rb | 2 | ||||
| -rw-r--r-- | lib/axlsx/version.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/axlsx/stylesheet/styles.rb b/lib/axlsx/stylesheet/styles.rb index 9db0a805..cb858884 100644 --- a/lib/axlsx/stylesheet/styles.rb +++ b/lib/axlsx/stylesheet/styles.rb @@ -222,6 +222,8 @@ module Axlsx applyProtection = (options[:hidden] || options[:locked]) ? 1 : 0 xf = Xf.new(:fillId => fill, :fontId=>fontId, :applyFill=>1, :applyFont=>1, :numFmtId=>numFmtId, :borderId=>borderId, :applyProtection=>applyProtection) + + xf.applyNumberFormat = true if xf.numFmtId > 0 if options[:alignment] xf.alignment = CellAlignment.new(options[:alignment]) diff --git a/lib/axlsx/version.rb b/lib/axlsx/version.rb index 7d217c22..541c7e85 100644 --- a/lib/axlsx/version.rb +++ b/lib/axlsx/version.rb @@ -3,5 +3,5 @@ module Axlsx # When using bunle exec rake and referencing the gem on github or locally # it will use the gemspec, which preloads this constant for the gem's version. # We check to make sure that it has not already been loaded - VERSION="1.0.14" unless Axlsx.const_defined? :VERSION + VERSION="1.0.15" unless Axlsx.const_defined? :VERSION end |