From 128df15c904d8ce6ca19c60debc2066e8104200c Mon Sep 17 00:00:00 2001 From: --unset Date: Sun, 19 Apr 2009 13:35:23 -0500 Subject: [PATCH] Fix cell children to use .content not .to_s --- lib/roo/openoffice.rb | 4 ++-- test/paragraph.ods | Bin 0 -> 7547 bytes test/test_roo.rb | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 test/paragraph.ods diff --git a/lib/roo/openoffice.rb b/lib/roo/openoffice.rb index 10bfbd9..a83942b 100644 --- a/lib/roo/openoffice.rb +++ b/lib/roo/openoffice.rb @@ -306,7 +306,7 @@ def read_cells(sheet=nil) str_v += children_to_string(str.children) else str.children.each do |child| - str_v = str_v + child.to_s #.text + str_v = str_v + child.content #.text end end str_v.gsub!(/'/,"'") # special case not supported by unescapeHTML @@ -447,7 +447,7 @@ def children_to_string(children) end result = result + " "*compressed_spaces else - result = result + child.to_s + result = result + child.content end end } diff --git a/test/paragraph.ods b/test/paragraph.ods new file mode 100644 index 0000000000000000000000000000000000000000..6a6cf217ddd1386f547a48841f7eac5aa51df5c9 GIT binary patch literal 7547 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