diff --git a/lib/roo/excelx.rb b/lib/roo/excelx.rb index 8b02e602..0ad27520 100644 --- a/lib/roo/excelx.rb +++ b/lib/roo/excelx.rb @@ -426,20 +426,6 @@ def process_zipfile_entries(entries) end end - # NOTE: To reduce memory, styles, shared_strings, workbook can be class - # variables in a Shared module. - def styles - @styles ||= Styles.new(File.join(@tmpdir, 'roo_styles.xml')) - end - - def shared_strings - @shared_strings ||= SharedStrings.new(File.join(@tmpdir, 'roo_sharedStrings.xml')) - end - - def workbook - @workbook ||= Workbook.new(File.join(@tmpdir, 'roo_workbook.xml')) - end - def safe_send(object, method, *args) object.send(method, *args) if object && object.respond_to?(method) end diff --git a/lib/roo/excelx/cell.rb b/lib/roo/excelx/cell.rb index 8ab21cb6..2fc78e16 100644 --- a/lib/roo/excelx/cell.rb +++ b/lib/roo/excelx/cell.rb @@ -11,7 +11,7 @@ module Roo class Excelx class Cell - attr_reader :type, :formula, :value, :excelx_type, :excelx_value, :style, :hyperlink, :coordinate + attr_reader :formula, :value, :excelx_type, :excelx_value, :style, :hyperlink, :coordinate attr_writer :value # DEPRECATED: Please use Cell.create_cell instead. diff --git a/lib/roo/open_office.rb b/lib/roo/open_office.rb index 8fe8252c..2a8eba49 100644 --- a/lib/roo/open_office.rb +++ b/lib/roo/open_office.rb @@ -285,7 +285,6 @@ def perform_decryption( algorithm_node['manifest:initialisation-vector'] ) key_derivation_name = key_derivation_node['manifest:key-derivation-name'] - key_size = key_derivation_node['manifest:key-size'].to_i iteration_count = key_derivation_node['manifest:iteration-count'].to_i salt = Base64.decode64(key_derivation_node['manifest:salt']) @@ -294,10 +293,8 @@ def perform_decryption( start_key_generation_node[ 'manifest:start-key-generation-name' ] - key_generation_size = start_key_generation_node['manifest:key-size'].to_i hashed_password = password - key = nil if key_generation_name == 'http://www.w3.org/2000/09/xmldsig#sha256'