lib/rubyXL/objects/worksheet.rb in rubyXL-3.4.15 vs lib/rubyXL/objects/worksheet.rb in rubyXL-3.4.16

@@ -86,11 +86,11 @@
     define_attribute(:useFirstPageNumber, :bool,   :default => false)
     define_attribute(:errors,             RubyXL::ST_PrintError, :default => 'displayed')
     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
 
   class TableParts < OOXMLContainerObject
     define_child_node(RubyXL::RID, :collection => :with_count, :node_name => :tablePart)
@@ -300,11 +300,11 @@
   end
 
   # 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
@@ -321,11 +321,11 @@
     define_attribute(:dvAspect,  RubyXL::ST_DvAspect, :default => 'DVASPECT_CONTENT')
     define_attribute(:link, :string)
     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.datypic.com/sc/ooxml/e-ssml_oleObjects-1.html
   class OLEObjects < OOXMLContainerObject
@@ -337,11 +337,11 @@
   # 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.datypic.com/sc/ooxml/e-ssml_dataRefs-1.html
   class DataConsolidationReferences < OOXMLContainerObject
@@ -432,11 +432,11 @@
   end
 
   # 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.datypic.com/sc/ooxml/e-ssml_controls-1.html
@@ -488,11 +488,11 @@
   end
 
   # 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.datypic.com/sc/ooxml/e-ssml_customProperties-1.html
   class CustomProperties < OOXMLContainerObject
@@ -570,10 +570,10 @@
     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_attribute(:'r:id',      :string)
+    define_relationship
     define_child_node(RubyXL::PivotArea)
     define_element_name 'pivotSelection'
   end
 
   # http://www.datypic.com/sc/ooxml/e-ssml_sheetView-1.html