diff options
| -rw-r--r-- | .rubocop_todo.yml | 7 | ||||
| -rw-r--r-- | lib/axlsx/workbook/worksheet/rich_text_run.rb | 6 |
2 files changed, 3 insertions, 10 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index bb6a38f9..4aaaa2ed 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -183,13 +183,6 @@ Style/GuardClause: - 'lib/axlsx/workbook/worksheet/table.rb' - 'lib/axlsx/workbook/worksheet/worksheet.rb' -# This cop supports unsafe autocorrection (--autocorrect-all). -# Configuration parameters: AllowedReceivers. -# AllowedReceivers: Thread.current -Style/HashEachMethods: - Exclude: - - 'lib/axlsx/workbook/worksheet/rich_text_run.rb' - # This cop supports safe autocorrection (--autocorrect). # Configuration parameters: AllowIfModifier. Style/IfInsideElse: diff --git a/lib/axlsx/workbook/worksheet/rich_text_run.rb b/lib/axlsx/workbook/worksheet/rich_text_run.rb index ffd2f941..e3522d4c 100644 --- a/lib/axlsx/workbook/worksheet/rich_text_run.rb +++ b/lib/axlsx/workbook/worksheet/rich_text_run.rb @@ -211,14 +211,14 @@ module Axlsx data = data.select { |key, value| valid.include?(key) && !value.nil? } str << '<r><rPr>' - data.keys.each do |key| + data.each do |key, val| case key when :font_name str << '<rFont val="' << font_name << '"/>' when :color - str << data[key].to_xml_string + str << val.to_xml_string else - str << '<' << key.to_s << ' val="' << xml_value(data[key]) << '"/>' + str << '<' << key.to_s << ' val="' << xml_value(val) << '"/>' end end clean_value = Axlsx::trust_input ? @value.to_s : ::CGI.escapeHTML(Axlsx::sanitize(@value.to_s)) |