summaryrefslogtreecommitdiffhomepage
path: root/lib/axlsx/workbook/worksheet/cell_serializer.rb
diff options
context:
space:
mode:
authorJurriaan Pruis <[email protected]>2014-03-12 22:04:50 +0100
committerJurriaan Pruis <[email protected]>2014-03-12 22:04:50 +0100
commit7b3b8a6ad71290d3e84f4ba10329f2855c5c3522 (patch)
treece99479c5db74e6474b52c9eed0607102beb815a /lib/axlsx/workbook/worksheet/cell_serializer.rb
parenta3a1b62d7751b7323c7ac0f23e75bb8409dffb9b (diff)
downloadcaxlsx-7b3b8a6ad71290d3e84f4ba10329f2855c5c3522.tar.gz
caxlsx-7b3b8a6ad71290d3e84f4ba10329f2855c5c3522.zip
Fix autowidth in combination with sanitizing
By only sanitizing just before serialisation.
Diffstat (limited to 'lib/axlsx/workbook/worksheet/cell_serializer.rb')
-rw-r--r--lib/axlsx/workbook/worksheet/cell_serializer.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/axlsx/workbook/worksheet/cell_serializer.rb b/lib/axlsx/workbook/worksheet/cell_serializer.rb
index 73b7c110..9a9f9465 100644
--- a/lib/axlsx/workbook/worksheet/cell_serializer.rb
+++ b/lib/axlsx/workbook/worksheet/cell_serializer.rb
@@ -28,7 +28,7 @@ module Axlsx
elsif cell.contains_rich_text?
cell.value.to_xml_string(str)
else
- str << ('<t>' << cell.value.to_s << '</t>')
+ str << ('<t>' << cell.clean_value << '</t>')
end
str
end
@@ -86,7 +86,7 @@ module Axlsx
# @param [String] str The string the serialized content will be appended to.
# @return [String]
def formula_serialization(cell, str='')
- str << ('t="str"><f>' << cell.value.to_s.sub('=', '') << '</f>')
+ str << ('t="str"><f>' << cell.clean_value.to_s.sub('=', '') << '</f>')
str << ('<v>' << cell.formula_value.to_s << '</v>') unless cell.formula_value.nil?
end
@@ -95,7 +95,7 @@ module Axlsx
# @param [String] str The string the serialized content will be appended to.
# @return [String]
def array_formula_serialization(cell, str='')
- str << ('t="str">' << '<f t="array" ref="' << cell.r << '">' << cell.value.to_s.sub('{=', '').sub(/}$/, '') << '</f>')
+ str << ('t="str">' << '<f t="array" ref="' << cell.r << '">' << cell.clean_value.to_s.sub('{=', '').sub(/}$/, '') << '</f>')
str << ('<v>' << cell.formula_value.to_s << '</v>') unless cell.formula_value.nil?
end