diff options
Diffstat (limited to 'lib/roo/excelx')
| -rw-r--r-- | lib/roo/excelx/relationships.rb | 10 | ||||
| -rwxr-xr-x | lib/roo/excelx/sheet_doc.rb | 7 |
2 files changed, 14 insertions, 3 deletions
diff --git a/lib/roo/excelx/relationships.rb b/lib/roo/excelx/relationships.rb index 19f9919..754775d 100644 --- a/lib/roo/excelx/relationships.rb +++ b/lib/roo/excelx/relationships.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'roo/excelx/extractor' module Roo @@ -11,10 +13,16 @@ module Roo @relationships ||= extract_relationships end + def include_type?(type) + to_a.any? do |_, rel| + rel["Type"]&.include? type + end + end + private def extract_relationships - return [] unless doc_exists? + return {} unless doc_exists? doc.xpath('/Relationships/Relationship').each_with_object({}) do |rel, hash| hash[rel['Id']] = rel diff --git a/lib/roo/excelx/sheet_doc.rb b/lib/roo/excelx/sheet_doc.rb index 2b3aa39..6da4c26 100755 --- a/lib/roo/excelx/sheet_doc.rb +++ b/lib/roo/excelx/sheet_doc.rb @@ -22,7 +22,7 @@ module Roo def hyperlinks(relationships) # If you're sure you're not going to need this hyperlinks you can discard it - @hyperlinks ||= if @options[:no_hyperlinks] + @hyperlinks ||= if @options[:no_hyperlinks] || !relationships.include_type?("hyperlink") {} else extract_hyperlinks(relationships) @@ -185,7 +185,10 @@ module Roo if relationship = relationships[hyperlink['id']] target_link = relationship['Target'] target_link += "##{hyperlink['location']}" if hyperlink['location'] - hash[::Roo::Utils.ref_to_key(hyperlink["ref"].to_s)] = target_link + + Roo::Utils.coordinates_in_range(hyperlink["ref"].to_s) do |coord| + hash[coord] = target_link + end end end end |