rubyXL 3.3.21 → 3.4.17

data/lib/rubyXL/objects/workbook.rb

@@ -7,17 +7,17 @@ require 'rubyXL/objects/theme'
 require 'rubyXL/objects/calculation_chain'
 require 'rubyXL/objects/worksheet'
 require 'rubyXL/objects/chartsheet'
+require 'rubyXL/objects/connection'
 require 'rubyXL/objects/relationships'
 require 'rubyXL/objects/simple_types'
 require 'rubyXL/objects/extensions'
 require 'rubyXL/objects/external_links'
-require 'rubyXL/convenience_methods'
 
 module RubyXL
 
   # Eventually, the entire code for Workbook will be moved here.
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_fileVersion-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_fileVersion-1.html
   class FileVersion < OOXMLObject
     define_attribute(:appName,      :string)
     define_attribute(:lastEdited,   :string)
@@ -27,15 +27,15 @@ module RubyXL
     define_element_name 'fileVersion'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_fileSharing-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_fileSharing-1.html
   class FileSharing < OOXMLObject
     define_attribute(:readOnlyRecommended, :bool, :default => false)
     define_attribute(:userName,            :string)
-    define_attribute(:reservationPassword, :string)
+    define_attribute(:reservationPassword, RubyXL::ST_UnsignedShortHex)
     define_element_name 'fileSharing'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_workbookPr-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_workbookPr-1.html
   class WorkbookProperties < OOXMLObject
     define_attribute(:date1904,                   :bool,   :default => false)
     define_attribute(:showObjects,                RubyXL::ST_Objects, :default => 'all')
@@ -58,17 +58,17 @@ module RubyXL
     define_element_name 'workbookPr'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_workbookProtection-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_workbookProtection-1.html
   class WorkbookProtection < OOXMLObject
-    define_attribute(:workbookPassword,  :string)
-    define_attribute(:revisionsPassword, :string)
+    define_attribute(:workbookPassword,  RubyXL::ST_UnsignedShortHex)
+    define_attribute(:revisionsPassword, RubyXL::ST_UnsignedShortHex)
     define_attribute(:lockStructure,     :bool,   :default => false)
     define_attribute(:lockWindows,       :bool,   :default => false)
     define_attribute(:lockRevision,      :bool,   :default => false)
     define_element_name 'workbookProtection'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_workbookView-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_workbookView-1.html
   class WorkbookView < OOXMLObject
     define_attribute(:visibility,             RubyXL::ST_Visibility, :default => 'visible')
     define_attribute(:minimized,              :bool,   :default => false)
@@ -87,40 +87,40 @@ module RubyXL
     define_element_name 'workbookView'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_bookViews-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_bookViews-1.html
   class WorkbookViews < OOXMLContainerObject
     define_child_node(RubyXL::WorkbookView, :collection => true)
     define_element_name 'bookViews'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_sheet-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_sheet-1.html
   class Sheet < OOXMLObject
     define_attribute(:name,            :string, :required => true)
     define_attribute(:sheetId,         :int,    :required => true)
     define_attribute(:state,           RubyXL::ST_Visibility, :default => 'visible')
-    define_attribute(:'r:id',          :string, :required => true)
+    define_relationship(:required => true)
     define_element_name 'sheet'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_sheets-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_sheets-1.html
   class Sheets < OOXMLContainerObject
     define_child_node(RubyXL::Sheet, :collection => true)
     define_element_name 'sheets'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_externalReference-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_externalReference-1.html
   class ExternalReference < OOXMLObject
-    define_attribute(:'r:id', :string, :required => true)
+    define_relationship(:required => true)
     define_element_name 'externalReference'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_externalReferences-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_externalReferences-1.html
   class ExternalReferences < OOXMLContainerObject
     define_child_node(RubyXL::ExternalReference, :collection => true)
     define_element_name 'externalReferences'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_definedName-2.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_definedName-2.html
   class DefinedName < OOXMLObject
     define_attribute(:name,              :string, :required => true)
     define_attribute(:comment,           :string)
@@ -144,32 +144,32 @@ module RubyXL
     define_element_name 'definedName'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_definedName-2.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_definedName-2.html
   class DefinedNames < OOXMLContainerObject
     define_child_node(RubyXL::DefinedName, :collection => true)
     define_element_name 'definedNames'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_pivotCache-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_pivotCache-1.html
   class PivotCache < OOXMLObject
     define_attribute(:cacheId, :int,    :required => true)
-    define_attribute(:'r:id',  :string, :required => true)
+    define_relationship(:required => true)
     define_element_name 'pivotCache'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_pivotCaches-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_pivotCaches-1.html
   class PivotCaches < OOXMLContainerObject
     define_child_node(RubyXL::PivotCache, :collection => true)
     define_element_name 'pivotCaches'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_oleSize-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_oleSize-1.html
   class OLESize < OOXMLObject
     define_attribute(:ref, :ref, :required => true)
     define_element_name 'oleSize'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_fileRecoveryPr-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_fileRecoveryPr-1.html
   class FileRecoveryProperties < OOXMLObject
     define_attribute(:autoRecover,     :bool, :default => true)
     define_attribute(:crashSave,       :bool, :default => false)
@@ -178,7 +178,7 @@ module RubyXL
     define_element_name 'fileRecoveryPr'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_webPublishing-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_webPublishing-1.html
   class WebPublishingProperties < OOXMLObject
     define_attribute(:css,              :bool,   :default => true)
     define_attribute(:thicket,          :bool,   :default => true)
@@ -191,7 +191,7 @@ module RubyXL
     define_element_name 'webPublishing'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_calcPr-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_calcPr-1.html
   class CalculationProperties < OOXMLObject
     define_attribute(:calcId,                :int)
     define_attribute(:calcMode,              RubyXL::ST_CalcMode, :default => 'auto')
@@ -209,7 +209,7 @@ module RubyXL
     define_element_name 'calcPr'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_webPublishObject-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_webPublishObject-1.html
   class WebPublishObject < OOXMLObject
     define_attribute(:id,              :int,    :required => true)
     define_attribute(:divId,           :string, :required => true)
@@ -220,20 +220,20 @@ module RubyXL
     define_element_name 'webPublishObject'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_webPublishObjects-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_webPublishObjects-1.html
   class WebPublishObjects < OOXMLContainerObject
     define_child_node(RubyXL::WebPublishObject, :collection => :with_count)
     define_element_name 'webPublishObjects'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_smartTagPr-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_smartTagPr-1.html
   class SmartTagProperties < OOXMLObject
     define_attribute(:embed, :bool,   :default => false)
     define_attribute(:show,  RubyXL::ST_SmartTagShow, :default => 'all')
     define_element_name 'smartTagPr'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_smartTagType-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_smartTagType-1.html
   class SmartTagType < OOXMLObject
     define_attribute(:namespaceUri, :string)
     define_attribute(:name,         :string)
@@ -241,26 +241,26 @@ module RubyXL
     define_element_name 'smartTagType'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_smartTagTypes-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_smartTagTypes-1.html
   class SmartTagTypes < OOXMLContainerObject
     define_child_node(RubyXL::SmartTagType, :collection => true)
     define_element_name 'smartTagTypes'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_functionGroup-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_functionGroup-1.html
   class FunctionGroup < OOXMLObject
     define_attribute(:name, :string)
     define_element_name 'functionGroup'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_functionGroups-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_functionGroups-1.html
   class FunctionGroups < OOXMLContainerObject
     define_attribute(:builtInGroupCountpi, :int, :default => 16)
     define_child_node(RubyXL::FunctionGroup, :collection => true)
     define_element_name 'functionGroups'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_customWorkbookView-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_customWorkbookView-1.html
   class CustomWorkbookView < OOXMLObject
     define_attribute(:name,                 :string, :required => true)
     define_attribute(:guid,                 :string, :required => true)
@@ -290,15 +290,17 @@ module RubyXL
     define_element_name 'customWorkbookView'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_customWorkbookViews-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_customWorkbookViews-1.html
   class CustomWorkbookViews < OOXMLContainerObject
     define_child_node(RubyXL::CustomWorkbookView, :collection => true)
     define_element_name 'customWorkbookViews'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_workbook.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_workbook.html
   class Workbook < OOXMLTopLevelObject
     CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml'
+    CONTENT_TYPE_TEMPLATE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.template.main+xml'
+    CONTENT_TYPE_TEMPLATE_WITH_MACROS = 'application/vnd.ms-excel.template.macroEnabled.main+xml'
     CONTENT_TYPE_WITH_MACROS = 'application/vnd.ms-excel.sheet.macroEnabled.main+xml'
     REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument'
 
@@ -309,7 +311,10 @@ module RubyXL
     include RubyXL::RelationshipSupport
 
     def content_type
-      if macros then CONTENT_TYPE_WITH_MACROS else CONTENT_TYPE end
+      content_type_name = 'CONTENT_TYPE'
+      content_type_name << '_TEMPLATE' if is_template
+      content_type_name << '_WITH_MACROS' if macros
+      self.class.const_get(content_type_name)
     end
 
     def related_objects
@@ -322,6 +327,7 @@ module RubyXL
     define_relationship(RubyXL::CalculationChain,   :calculation_chain)
     define_relationship(RubyXL::Worksheet,          false)
     define_relationship(RubyXL::Chartsheet,         false)
+    define_relationship(RubyXL::Connections)
     define_relationship(RubyXL::ExternalLinksFile)
     define_relationship(RubyXL::PivotCacheDefinitionFile)
     define_relationship(RubyXL::PivotCacheRecordsFile)
@@ -332,6 +338,7 @@ module RubyXL
     define_child_node(RubyXL::FileVersion)
     define_child_node(RubyXL::FileSharing)
     define_child_node(RubyXL::WorkbookProperties, :accessor => :workbook_properties)
+    define_child_node(RubyXL::RevisionPointer)
     define_child_node(RubyXL::AlternateContent) # Somehow, order matters here
     define_child_node(RubyXL::WorkbookProtection)
     define_child_node(RubyXL::WorkbookViews)
@@ -357,6 +364,7 @@ module RubyXL
                    'http://schemas.microsoft.com/office/spreadsheetml/2010/11/main' => 'x15')
 
     attr_accessor :worksheets
+    attr_accessor :is_template
 
     def before_write_xml
       max_sheet_id = worksheets.collect(&:sheet_id).compact.max || 0
@@ -391,8 +399,8 @@ module RubyXL
       dst_file_path ||= root.source_file_path
 
       extension = File.extname(dst_file_path)
-      unless %w{.xlsx .xlsm}.include?(extension.downcase)
-        raise "Unsupported extension: #{extension} (only .xlsx and .xlsm files are supported)."
+      unless %w{.xlsx .xlsm .xltx .xltm}.include?(extension.downcase)
+        raise "Unsupported extension: #{extension} (only .xlsx, .xlsm, .xltx and .xltm files are supported)."
       end
 
       File.open(dst_file_path, "wb") { |output_file| FileUtils.copy_stream(root.stream, output_file) }
@@ -412,16 +420,22 @@ module RubyXL
     private :base_date
 
     def date_to_num(date)
-      date && (date.ajd - base_date().ajd).to_f
+      case date
+      when Date, DateTime then (date.ajd - base_date().ajd).to_f
+      when Time then ((date.to_r - base_date().to_time.to_r) / 86400).to_f
+      end
     end
 
     def num_to_date(num)
+      return nil if num.nil?
+
       # Bug-for-bug Excel compatibility (https://support.microsoft.com/kb/214058/)
-      if num && num < MARCH_1_1900 then
+      if num < MARCH_1_1900 then
         num += 1 unless workbook_properties && workbook_properties.date1904
       end
 
-      num && (base_date + num)
+      dateparts = num.divmod(1)
+      base_date + (dateparts[0] + (dateparts[1] * 86400).round(6) / 86400)
     end
 
     include Enumerable
@@ -430,7 +444,8 @@ module RubyXL
     APPVERSION  = '12.0000'
 
     def initialize(worksheets = [], src_file_path = nil, creator = nil, modifier = nil, created_at = nil,
-                   company = '', application = APPLICATION, appversion = APPVERSION, date1904 = 0)
+                   company = '', application = APPLICATION, appversion = APPVERSION, date1904 = 0,
+                   is_template = false)
       super()
 
       # Order of sheets in the +worksheets+ array corresponds to the order of pages in Excel UI.
@@ -455,9 +470,104 @@ module RubyXL
       self.creator     = creator
       self.modifier    = modifier
       self.date1904    = date1904 > 0
+      self.is_template = is_template
+    end
+
+    SHEET_NAME_TEMPLATE = 'Sheet%d'
+
+    # Finds worksheet by its name or numerical index
+    def [](ind)
+      case ind
+      when Integer then worksheets[ind]
+      when String  then worksheets.find { |ws| ws.sheet_name == ind }
+      end
+    end
+
+    # Create new simple worksheet and add it to the workbook worksheets
+    #
+    # @param [String] The name for the new worksheet
+    def add_worksheet(name = nil)
+      if name.nil? then
+        n = 0
+
+        begin
+          name = SHEET_NAME_TEMPLATE % (n += 1)
+        end until self[name].nil?
+      end
+
+      new_worksheet = Worksheet.new(:workbook => self, :sheet_name => name)
+      worksheets << new_worksheet
+      new_worksheet
+    end
+
+    def created_at
+      root.core_properties.created_at
+    end
+
+    def created_at=(v)
+      root.core_properties.created_at = v
+    end
+
+    def modified_at
+      root.core_properties.modified_at
+    end
+
+    def modified_at=(v)
+      root.core_properties.modified_at = v
+    end
+
+    def company
+      root.document_properties.company && root.document_properties.company.value
+    end
+
+    def company=(v)
+      root.document_properties.company ||= StringNode.new
+      root.document_properties.company.value = v
+    end
+
+    def application
+      root.document_properties.application && root.document_properties.application.value
+    end
+
+    def application=(v)
+      root.document_properties.application ||= StringNode.new
+      root.document_properties.application.value = v
+    end
+
+    def appversion
+      root.document_properties.app_version && root.document_properties.app_version.value
+    end
+
+    def appversion=(v)
+      root.document_properties.app_version ||= StringNode.new
+      root.document_properties.app_version.value = v
+    end
+
+    def creator
+      root.core_properties.creator
+    end
+
+    def creator=(v)
+      root.core_properties.creator = v
+    end
+
+    def modifier
+      root.core_properties.modifier
+    end
+
+    def modifier=(v)
+      root.core_properties.modifier = v
+    end
+
+    def date1904
+      workbook_properties && workbook_properties.date1904
+    end
+
+    def date1904=(v)
+      self.workbook_properties ||= RubyXL::WorkbookProperties.new
+      workbook_properties.date1904 = v
     end
 
-    include WorkbookConvenienceMethods
   end
 
 end

data/lib/rubyXL/objects/worksheet.rb

@@ -10,14 +10,15 @@ require 'rubyXL/objects/column_range'
 require 'rubyXL/objects/filters'
 require 'rubyXL/objects/data_validation'
 require 'rubyXL/objects/comments'
+require 'rubyXL/objects/connection'
+require 'rubyXL/objects/query_table'
 require 'rubyXL/worksheet'
-require 'rubyXL/convenience_methods'
 
 module RubyXL
 
   # Eventually, the entire code for Worksheet will be moved here. One small step at a time!
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_outlinePr-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_outlinePr-1.html
   class OutlineProperties < OOXMLObject
     define_attribute(:applyStyles,        :bool, :default => false)
     define_attribute(:summaryBelow,       :bool, :default => true)
@@ -26,14 +27,14 @@ module RubyXL
     define_element_name 'outlinePr'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_pageSetUpPr-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_pageSetUpPr-1.html
   class PageSetupProperties < OOXMLObject
     define_attribute(:autoPageBreaks, :bool, :default => true)
     define_attribute(:fitToPage,      :bool, :default => false)
     define_element_name 'pageSetUpPr'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_sheetPr-3.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_sheetPr-3.html
   class WorksheetProperties < OOXMLObject
     define_attribute(:syncHorizontal,                    :bool, :default => false)
     define_attribute(:syncVertical,                      :bool, :default => false)
@@ -50,7 +51,7 @@ module RubyXL
     define_element_name 'sheetPr'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_dimension-3.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_dimension-3.html
   class WorksheetDimensions < OOXMLObject
     define_attribute(:ref, :ref)
     define_element_name 'dimension'
@@ -69,7 +70,7 @@ module RubyXL
     define_element_name 'sheetFormatPr'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_pageSetup-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_pageSetup-1.html
   class PageSetup < OOXMLObject
     define_attribute(:paperSize,          :int,    :default => 1)
     define_attribute(:scale,              :int,    :default => 100)
@@ -87,7 +88,7 @@ module RubyXL
     define_attribute(:horizontalDpi,      :int,    :default => 600)
     define_attribute(:verticalDpi,        :int,    :default => 600)
     define_attribute(:copies,             :int,    :default => 1)
-    define_attribute(:'r:id',             :string)
+    define_relationship
     define_element_name 'pageSetup'
   end
 
@@ -96,19 +97,19 @@ module RubyXL
     define_element_name 'tableParts'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_mergeCell-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_mergeCell-1.html
   class MergedCell < OOXMLObject
     define_attribute(:ref, :ref)
     define_element_name 'mergeCell'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_mergeCells-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_mergeCells-1.html
   class MergedCells < OOXMLContainerObject
     define_child_node(RubyXL::MergedCell, :collection => :with_count)
     define_element_name 'mergeCells'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_printOptions-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_printOptions-1.html
   class PrintOptions < OOXMLObject
     define_attribute(:horizontalCentered, :bool, :default => false)
     define_attribute(:verticalCentered,   :bool, :default => false)
@@ -118,30 +119,30 @@ module RubyXL
     define_element_name 'printOptions'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_sheetCalcPr-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_sheetCalcPr-1.html
   class SheetCalculationProperties < OOXMLObject
     define_attribute(:fullCalcOnLoad, :bool, :default => false)
     define_element_name 'sheetCalcPr'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_protectedRange-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_protectedRange-1.html
   class ProtectedRange < OOXMLObject
-    define_attribute(:password,           :string)
+    define_attribute(:password,           RubyXL::ST_UnsignedShortHex)
     define_attribute(:sqref,              :sqref,  :required => true)
     define_attribute(:name,               :string, :required => true)
     define_attribute(:securityDescriptor, :string)
     define_element_name 'protectedRange'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_protectedRanges-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_protectedRanges-1.html
   class ProtectedRanges < OOXMLContainerObject
     define_child_node(RubyXL::ProtectedRange, :collection => true)
     define_element_name 'protectedRanges'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_sheetProtection-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_sheetProtection-1.html
   class WorksheetProtection < OOXMLObject
-    define_attribute(:password,            :string)
+    define_attribute(:password,            RubyXL::ST_UnsignedShortHex)
     define_attribute(:sheet,               :bool, :default => false)
     define_attribute(:objects,             :bool, :default => false)
     define_attribute(:scenarios,           :bool, :default => false)
@@ -161,7 +162,7 @@ module RubyXL
     define_element_name 'sheetProtection'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_cfvo-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_cfvo-1.html
   class ConditionalFormatValue < OOXMLObject
     define_attribute(:type, RubyXL::ST_CfvoType, :required => true)
     define_attribute(:val,  :string)
@@ -170,14 +171,14 @@ module RubyXL
     define_element_name 'cfvo'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_colorScale-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_colorScale-1.html
   class ColorScale < OOXMLObject
     define_child_node(RubyXL::ConditionalFormatValue, :collection => true, :accessor => :cfvo)
     define_child_node(RubyXL::Color)
     define_element_name 'colorScale'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_dataBar-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_dataBar-1.html
   class DataBar < OOXMLObject
     define_attribute(:minLength, :int,  :default => 10)
     define_attribute(:maxLength, :int,  :default => 90)
@@ -187,7 +188,7 @@ module RubyXL
     define_element_name 'dataBar'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_iconSet-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_iconSet-1.html
   class IconSet < OOXMLObject
     define_attribute(:iconSet,   RubyXL::ST_IconSetType, :default => '3TrafficLights1')
     define_attribute(:showValue, :bool, :default => true)
@@ -197,7 +198,7 @@ module RubyXL
     define_element_name 'iconSet'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_cfRule-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_cfRule-1.html
   class ConditionalFormattingRule < OOXMLObject
     define_attribute(:type,         RubyXL::ST_CfType)
     define_attribute(:dxfId,        :int)
@@ -220,7 +221,7 @@ module RubyXL
     define_element_name 'cfRule'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_brk-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_brk-1.html
   class Break < OOXMLObject
     define_attribute(:id,  :int,  :default => 0)
     define_attribute(:min, :int,  :default => 0)
@@ -230,13 +231,13 @@ module RubyXL
     define_element_name 'brk'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_rowBreaks-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_rowBreaks-1.html
   class BreakList < OOXMLContainerObject
     define_attribute(:manualBreakCount, :int, :default => 0)
     define_child_node(RubyXL::Break, :collection => :with_count)
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_conditionalFormatting-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_conditionalFormatting-1.html
   class ConditionalFormatting < OOXMLObject
     define_attribute(:pivot, :bool, :default => false)
     define_attribute(:sqref, :sqref)
@@ -245,7 +246,7 @@ module RubyXL
     define_element_name 'conditionalFormatting'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_inputCells-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_inputCells-1.html
   class InputCells < OOXMLObject
     define_attribute(:r,        :ref,    :required => true)
     define_attribute(:deleted,  :bool,   :default => false)
@@ -255,7 +256,7 @@ module RubyXL
     define_element_name 'inputCells'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_scenario-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_scenario-1.html
   class Scenario < OOXMLContainerObject
     define_attribute(:name,    :string)
     define_attribute(:locked,  :bool, :default => false)
@@ -266,7 +267,7 @@ module RubyXL
     define_element_name 'scenario'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_scenarios-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_scenarios-1.html
   class Scenarios < OOXMLContainerObject
     define_attribute(:current, :int)
     define_attribute(:show,    :int)
@@ -275,7 +276,7 @@ module RubyXL
     define_element_name 'scenarios'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_ignoredError-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_ignoredError-1.html
   class IgnoredError < OOXMLObject
     define_attribute(:sqref,              :sqref, :required => true)
     define_attribute(:pivot,              :bool,  :default  => false)
@@ -291,30 +292,30 @@ module RubyXL
     define_element_name 'ignoredError'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_ignoredErrors-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_ignoredErrors-1.html
   class IgnoredErrors < OOXMLContainerObject
     define_child_node(RubyXL::IgnoredError, :collection => true)
     define_child_node(RubyXL::ExtensionStorageArea)
     define_element_name 'ignoredErrors'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_hyperlink-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_hyperlink-1.html
   class Hyperlink < OOXMLObject
     define_attribute(:ref,      :ref,    :required => true)
-    define_attribute(:'r:id',   :string)
+    define_relationship
     define_attribute(:location, :string)
     define_attribute(:tooltip,  :string)
     define_attribute(:display,  :string)
     define_element_name 'hyperlink'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_hyperlinks-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_hyperlinks-1.html
   class Hyperlinks < OOXMLContainerObject
     define_child_node(RubyXL::Hyperlink, :collection => true)
     define_element_name 'hyperlinks'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_oleObject-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_oleObject-1.html
   class OLEObject < OOXMLObject
     define_attribute(:progId,    :string)
     define_attribute(:dvAspect,  RubyXL::ST_DvAspect, :default => 'DVASPECT_CONTENT')
@@ -322,33 +323,33 @@ module RubyXL
     define_attribute(:oleUpdate, RubyXL::ST_OleUpdate)
     define_attribute(:autoLoad,  :bool, :default => false)
     define_attribute(:shapeId,   :int,  :required => true)
-    define_attribute(:'r:id',    :string)
+    define_relationship
     define_element_name 'oleObject'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_oleObjects-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_oleObjects-1.html
   class OLEObjects < OOXMLContainerObject
     define_child_node(RubyXL::OLEObject, :collection => true)
     define_child_node(RubyXL::AlternateContent)
     define_element_name 'oleObjects'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_dataRef-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_dataRef-1.html
   class DataConsolidationReference < OOXMLObject
     define_attribute(:ref,    :ref)
     define_attribute(:name,   :string)
     define_attribute(:sheet,  :string)
-    define_attribute(:'r:id', :string)
+    define_relationship
     define_element_name 'dataRef'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_dataRefs-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_dataRefs-1.html
   class DataConsolidationReferences < OOXMLContainerObject
     define_child_node(RubyXL::DataConsolidationReference, :collection => :with_count)
     define_element_name 'dataRefs'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_dataConsolidate-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_dataConsolidate-1.html
   class DataConsolidate < OOXMLObject
     define_attribute(:function,   RubyXL::ST_DataConsolidateFunction, :default => 'sum')
     define_attribute(:leftLabels, :bool, :default => false)
@@ -358,29 +359,29 @@ module RubyXL
     define_element_name 'dataConsolidate'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_pane-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_pane-1.html
   class Pane < OOXMLObject
     define_attribute(:xSplit,      :double)
     define_attribute(:ySplit,      :double)
-    define_attribute(:topLeftCell, :string)
-    define_attribute(:activePane,  RubyXL::ST_Pane, :default => 'topLeft', )
-    define_attribute(:state,       RubyXL::ST_PaneState, :default=> 'split')
+    define_attribute(:topLeftCell, :ref)
+    define_attribute(:activePane,  RubyXL::ST_Pane,      :default => 'topLeft')
+    define_attribute(:state,       RubyXL::ST_PaneState, :default => 'split')
     define_element_name 'pane'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_selection-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_selection-1.html
   class Selection < OOXMLObject
     define_attribute(:pane,         RubyXL::ST_Pane)
     define_attribute(:activeCell,   :ref)
-    define_attribute(:activeCellId, :int)   # 0-based index of @active_cell in @sqref
+    define_attribute(:activeCellId, :uint)  # 0-based index of @active_cell in @sqref
     define_attribute(:sqref,        :sqref) # Array of references to the selected cells.
     define_element_name 'selection'
 
     def before_write_xml
-      # Normally, rindex of activeCellId in sqref:
+      # Normally, +rindex+ of activeCellId in sqref:
       # <selection activeCell="E12" activeCellId="9" sqref="A4 B6 C8 D10 E12 A4 B6 C8 D10 E12"/>
       if @active_cell_id.nil? && !@active_cell.nil? && @sqref.size > 1 then
-        # But, things can be more complex:
+        # But, things can get more complicated:
         # <selection activeCell="E8" activeCellId="2" sqref="A4:B4 C6:D6 E8:F8"/>
         # Not using .reverse.each here to avoid memory reallocation.
         @sqref.each_with_index { |ref, ind| @active_cell_id = ind if ref.cover?(@active_cell) }
@@ -389,7 +390,7 @@ module RubyXL
     end
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_customSheetView-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_customSheetView-1.html
   class CustomSheetView < OOXMLObject
     define_attribute(:guid,           :string, :required => true)
     define_attribute(:scale,          :int,    :default => 100)
@@ -424,47 +425,47 @@ module RubyXL
     define_element_name 'customSheetView'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_customSheetViews-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_customSheetViews-1.html
   class CustomSheetViews < OOXMLContainerObject
     define_child_node(RubyXL::CustomSheetView, :collection => true)
     define_element_name 'customSheetViews'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_control-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_control-1.html
   class EmbeddedControl < OOXMLObject
     define_attribute(:shapeId, :int,    :required => true)
-    define_attribute(:'r:id',  :string, :required => true)
+    define_relationship(:required => true)
     define_attribute(:name,    :string)
     define_element_name 'control'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_controls-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_controls-1.html
   class EmbeddedControls < OOXMLContainerObject
     define_child_node(RubyXL::EmbeddedControl, :collection => true)
     define_child_node(RubyXL::AlternateContent)
     define_element_name 'controls'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_cellWatch-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_cellWatch-1.html
   class CellWatch < OOXMLObject
     define_attribute(:r, :ref)
     define_element_name 'cellWatch'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_cellWatches-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_cellWatches-1.html
   class CellWatches < OOXMLContainerObject
     define_child_node(RubyXL::CellWatch, :collection => true)
     define_element_name 'cellWatches'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_cellSmartTagPr-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_cellSmartTagPr-1.html
   class CellSmartTagProperty < OOXMLObject
     define_attribute(:key, :string, :required => true)
     define_attribute(:val, :string, :required => true)
     define_element_name 'cellSmartTagPr'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_cellSmartTag-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_cellSmartTag-1.html
   class CellSmartTag < OOXMLObject
     define_attribute(:type,     :int,  :required => true)
     define_attribute(:deleted,  :bool, :default => false)
@@ -473,27 +474,27 @@ module RubyXL
     define_element_name 'cellSmartTag'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_cellSmartTags-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_cellSmartTags-1.html
   class CellSmartTags < OOXMLContainerObject
     define_attribute(:r, :ref, :accessor => :ref)
     define_child_node(RubyXL::CellSmartTag, :collection => true)
     define_element_name 'cellSmartTags'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_smartTags-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_smartTags-1.html
   class SmartTags < OOXMLContainerObject
     define_child_node(RubyXL::CellSmartTags, :collection => true)
     define_element_name 'smartTags'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_customPr-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_customPr-1.html
   class CustomProperty < OOXMLObject
     define_attribute(:name,   :string, :required => true)
-    define_attribute(:'r:id', :string, :required => true)
+    define_relationship(:required => true)
     define_element_name 'customPr'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_customProperties-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_customProperties-1.html
   class CustomProperties < OOXMLContainerObject
     define_child_node(RubyXL::CustomProperty, :collection => true)
     define_element_name 'customProperties'
@@ -528,75 +529,75 @@ module RubyXL
     define_element_name 'reference'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_references-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_references-1.html
   class PivotReferences < OOXMLContainerObject
     define_child_node(RubyXL::PivotReference, :collection => :with_count)
     define_element_name 'references'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_pivotArea-4.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_pivotArea-4.html
   class PivotArea < OOXMLObject
     define_attribute(:field,         :int)
     define_attribute(:type,          RubyXL::ST_PivotAreaType, :default => 'normal')
-    define_attribute(:dataOnly,      :bool,   :default => true)
-    define_attribute(:labelOnly,     :bool,   :default => false)
-    define_attribute(:grandRow,      :bool,   :default => false)
-    define_attribute(:grandCol,      :bool,   :default => false)
-    define_attribute(:cacheIndex,    :bool,   :default => false)
-    define_attribute(:outline,       :bool,   :default => true)
+    define_attribute(:dataOnly,      :bool, :default => true)
+    define_attribute(:labelOnly,     :bool, :default => false)
+    define_attribute(:grandRow,      :bool, :default => false)
+    define_attribute(:grandCol,      :bool, :default => false)
+    define_attribute(:cacheIndex,    :bool, :default => false)
+    define_attribute(:outline,       :bool, :default => true)
     define_attribute(:offset,        :ref)
     define_attribute(:collapsedLevelsAreSubtotals, :bool,   :default => false)
     define_attribute(:axis,          RubyXL::ST_Axis)
-    define_attribute(:fieldPosition, :int,    :default => 0)
+    define_attribute(:fieldPosition, :int,  :default => 0)
     define_child_node(RubyXL::PivotReferences)
     define_child_node(RubyXL::ExtensionStorageArea)
     define_element_name 'pivotArea'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_pivotSelection-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_pivotSelection-1.html
   class PivotTableSelection < OOXMLObject
     define_attribute(:pane,        RubyXL::ST_Pane, :default => 'topLeft')
-    define_attribute(:showHeader,  :bool,   :default => false)
-    define_attribute(:label,       :bool,   :default => false)
-    define_attribute(:data,        :bool,   :default => false)
-    define_attribute(:extendable,  :bool,   :default => false)
-    define_attribute(:count,       :int,    :default => 0)
+    define_attribute(:showHeader,  :bool, :default => false)
+    define_attribute(:label,       :bool, :default => false)
+    define_attribute(:data,        :bool, :default => false)
+    define_attribute(:extendable,  :bool, :default => false)
+    define_attribute(:count,       :uint, :default => 0)
     define_attribute(:axis,        RubyXL::ST_Axis)
-    define_attribute(:dimension,   :int,    :default => 0)
-    define_attribute(:start,       :int,    :default => 0)
-    define_attribute(:min,         :int,    :default => 0)
-    define_attribute(:max,         :int,    :default => 0)
-    define_attribute(:activeRow,   :int,    :default => 0)
-    define_attribute(:activeCol,   :int,    :default => 0)
-    define_attribute(:previousRow, :int,    :default => 0)
-    define_attribute(:previousCol, :int,    :default => 0)
-    define_attribute(:click,       :int,    :default => 0)
-    define_attribute(:'r:id',      :string)
+    define_attribute(:dimension,   :uint, :default => 0)
+    define_attribute(:start,       :uint, :default => 0)
+    define_attribute(:min,         :uint, :default => 0)
+    define_attribute(:max,         :uint, :default => 0)
+    define_attribute(:activeRow,   :uint, :default => 0)
+    define_attribute(:activeCol,   :uint, :default => 0)
+    define_attribute(:previousRow, :uint, :default => 0)
+    define_attribute(:previousCol, :uint, :default => 0)
+    define_attribute(:click,       :uint, :default => 0)
+    define_relationship
     define_child_node(RubyXL::PivotArea)
     define_element_name 'pivotSelection'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_sheetView-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_sheetView-1.html
   class WorksheetView < OOXMLObject
-    define_attribute(:windowProtection,         :bool,   :default => false)
-    define_attribute(:showFormulas,             :bool,   :default => false)
-    define_attribute(:showGridLines,            :bool,   :default => true)
-    define_attribute(:showRowColHeaders,        :bool,   :default => true)
-    define_attribute(:showZeros,                :bool,   :default => true)
-    define_attribute(:rightToLeft,              :bool,   :default => false)
-    define_attribute(:tabSelected,              :bool,   :default => false)
-    define_attribute(:showRuler,                :bool,   :default => true)
-    define_attribute(:showOutlineSymbols,       :bool,   :default => true)
-    define_attribute(:defaultGridColor,         :bool,   :default => true)
-    define_attribute(:showWhiteSpace,           :bool,   :default => true)
+    define_attribute(:windowProtection,         :bool, :default => false)
+    define_attribute(:showFormulas,             :bool, :default => false)
+    define_attribute(:showGridLines,            :bool, :default => true)
+    define_attribute(:showRowColHeaders,        :bool, :default => true)
+    define_attribute(:showZeros,                :bool, :default => true)
+    define_attribute(:rightToLeft,              :bool, :default => false)
+    define_attribute(:tabSelected,              :bool, :default => false)
+    define_attribute(:showRuler,                :bool, :default => true)
+    define_attribute(:showOutlineSymbols,       :bool, :default => true)
+    define_attribute(:defaultGridColor,         :bool, :default => true)
+    define_attribute(:showWhiteSpace,           :bool, :default => true)
     define_attribute(:view,                     RubyXL::ST_SheetViewType, :default => 'normal')
     define_attribute(:topLeftCell,              :ref)
-    define_attribute(:colorId,                  :int,    :default => 64)
-    define_attribute(:zoomScale,                :int,    :default => 100)
-    define_attribute(:zoomScaleNormal,          :int,    :default => 0)
-    define_attribute(:zoomScaleSheetLayoutView, :bool,   :default => 0)
-    define_attribute(:zoomScalePageLayoutView,  :bool,   :default => 0)
-    define_attribute(:workbookViewId,           :int,    :required => true, :default => 0 )
+    define_attribute(:colorId,                  :uint, :default => 64)
+    define_attribute(:zoomScale,                :uint, :default => 100)
+    define_attribute(:zoomScaleNormal,          :uint, :default => 0)
+    define_attribute(:zoomScaleSheetLayoutView, :uint, :default => 0)
+    define_attribute(:zoomScalePageLayoutView,  :uint, :default => 0)
+    define_attribute(:workbookViewId,           :uint, :required => true, :default => 0 )
     define_child_node(RubyXL::Pane)
     define_child_node(RubyXL::Selection, :collection => true, :accessor => :selections)
     define_child_node(RubyXL::PivotTableSelection, :collection => true, :accessor => :pivot_table_selections )
@@ -604,14 +605,14 @@ module RubyXL
     define_element_name 'sheetView'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_sheetViews-3.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_sheetViews-3.html
   class WorksheetViews < OOXMLContainerObject
     define_child_node(RubyXL::WorksheetView, :collection => true)
     define_child_node(RubyXL::ExtensionStorageArea)
     define_element_name 'sheetViews'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_worksheet.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_worksheet.html
   class Worksheet < OOXMLTopLevelObject
     CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml'
     REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet'
@@ -630,8 +631,11 @@ module RubyXL
     define_relationship(RubyXL::PivotTableFile)
     define_relationship(RubyXL::TableFile)
     define_relationship(RubyXL::ControlPropertiesFile)
+    define_relationship(RubyXL::CustomPropertyFile)
     define_relationship(RubyXL::SlicerFile)
     define_relationship(RubyXL::OLEObjectFile)
+    define_relationship(RubyXL::ActiveX)
+    define_relationship(RubyXL::QueryTable)
 
     define_child_node(RubyXL::WorksheetProperties)
     define_child_node(RubyXL::WorksheetDimensions)
@@ -740,8 +744,15 @@ module RubyXL
       sheet_obj
     end
 
+    def get_col_xf(column_index)
+      workbook.stylesheet.cell_xfs[get_col_style(column_index)]
+    end
+
+    def get_row_xf(row)
+      workbook.stylesheet.cell_xfs[get_row_style(row)]
+    end
+
     include LegacyWorksheet
-    include WorksheetConvenienceMethods
   end
 
 end