diff options
| author | pjskennedy <[email protected]> | 2022-03-02 10:30:14 -0800 |
|---|---|---|
| committer | pjskennedy <[email protected]> | 2022-03-02 10:30:14 -0800 |
| commit | d800d9a46e79ea2749d38e40cf4f0dabcda59d3f (patch) | |
| tree | da1f3481494c8ea2c24b38cfe43ec8eff0f9ba66 /lib/axlsx/stylesheet | |
| parent | 20e3f21964c60477e68d4d3731a11a1650ea5061 (diff) | |
| download | caxlsx-d800d9a46e79ea2749d38e40cf4f0dabcda59d3f.tar.gz caxlsx-d800d9a46e79ea2749d38e40cf4f0dabcda59d3f.zip | |
instance_values -> instance_values_for
Diffstat (limited to 'lib/axlsx/stylesheet')
| -rw-r--r-- | lib/axlsx/stylesheet/font.rb | 2 | ||||
| -rw-r--r-- | lib/axlsx/stylesheet/styles.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/axlsx/stylesheet/font.rb b/lib/axlsx/stylesheet/font.rb index 093d160e..48d2b584 100644 --- a/lib/axlsx/stylesheet/font.rb +++ b/lib/axlsx/stylesheet/font.rb @@ -147,7 +147,7 @@ module Axlsx # @return [String] def to_xml_string(str = '') str << '<font>' - Axlsx.instance_values(self).each do |k, v| + Axlsx.instance_values_for(self).each do |k, v| v.is_a?(Color) ? v.to_xml_string(str) : (str << ('<' << k.to_s << ' val="' << Axlsx.booleanize(v).to_s << '"/>')) end str << '</font>' diff --git a/lib/axlsx/stylesheet/styles.rb b/lib/axlsx/stylesheet/styles.rb index c9fdbf55..6bfd0a52 100644 --- a/lib/axlsx/stylesheet/styles.rb +++ b/lib/axlsx/stylesheet/styles.rb @@ -279,7 +279,7 @@ module Axlsx # @return [Font|Integer] def parse_font_options(options={}) return if (options.keys & [:fg_color, :sz, :b, :i, :u, :strike, :outline, :shadow, :charset, :family, :font_name]).empty? - Axlsx.instance_values(fonts.first).each do |key, value| + Axlsx.instance_values_for(fonts.first).each do |key, value| # Thanks for that 1.8.7 - cant do a simple merge... options[key.to_sym] = value unless options.keys.include?(key.to_sym) end @@ -438,7 +438,7 @@ module Axlsx # @return [String] def to_xml_string(str = '') str << ('<styleSheet xmlns="' << XML_NS << '">') - instance_vals = Axlsx.instance_values(self) + instance_vals = Axlsx.instance_values_for(self) [:numFmts, :fonts, :fills, :borders, :cellStyleXfs, :cellXfs, :cellStyles, :dxfs, :tableStyles].each do |key| instance_vals[key.to_s].to_xml_string(str) unless instance_vals[key.to_s].nil? end |