summaryrefslogtreecommitdiffhomepage
path: root/lib
diff options
context:
space:
mode:
authorRandy Morgan <[email protected]>2012-09-11 14:00:54 +0900
committerRandy Morgan <[email protected]>2012-09-11 14:00:54 +0900
commitdf0d6d5222bd28c912652dee5b515598cb9da76a (patch)
treef3f109500edede8f7b96a1f577447aa24f50d95b /lib
parentff625413ecd2b06ead85eb1a64e9f9b8872589de (diff)
downloadcaxlsx-df0d6d5222bd28c912652dee5b515598cb9da76a.tar.gz
caxlsx-df0d6d5222bd28c912652dee5b515598cb9da76a.zip
last release prep and early keynote for sprk
Diffstat (limited to 'lib')
-rw-r--r--lib/axlsx/package.rb1
-rw-r--r--lib/axlsx/workbook/worksheet/page_setup.rb4
-rw-r--r--lib/axlsx/workbook/worksheet/worksheet_hyperlinks.rb3
3 files changed, 7 insertions, 1 deletions
diff --git a/lib/axlsx/package.rb b/lib/axlsx/package.rb
index c98e3e89..4146420f 100644
--- a/lib/axlsx/package.rb
+++ b/lib/axlsx/package.rb
@@ -242,7 +242,6 @@ module Axlsx
# @private
def content_types
c_types = base_content_types
-
workbook.drawings.each do |drawing|
c_types << Axlsx::Override.new(:PartName => "/xl/#{drawing.pn}",
:ContentType => DRAWING_CT)
diff --git a/lib/axlsx/workbook/worksheet/page_setup.rb b/lib/axlsx/workbook/worksheet/page_setup.rb
index dfc84e56..b3e1051e 100644
--- a/lib/axlsx/workbook/worksheet/page_setup.rb
+++ b/lib/axlsx/workbook/worksheet/page_setup.rb
@@ -167,6 +167,10 @@ module Axlsx
# @return [Integer]
attr_reader :paper_size
+
+ # Sets the paper size for printing.
+ # @see PageSetup#paper_size
+ # @return integer
def paper_size=(size)
RestrictionValidator.validate 'paper_size', (1..118), size
@paper_size = size
diff --git a/lib/axlsx/workbook/worksheet/worksheet_hyperlinks.rb b/lib/axlsx/workbook/worksheet/worksheet_hyperlinks.rb
index b4cdad19..7659655a 100644
--- a/lib/axlsx/workbook/worksheet/worksheet_hyperlinks.rb
+++ b/lib/axlsx/workbook/worksheet/worksheet_hyperlinks.rb
@@ -1,4 +1,5 @@
module Axlsx
+
#A collection of hyperlink objects for a worksheet
class WorksheetHyperlinks < SimpleTypedList
@@ -18,6 +19,8 @@ module Axlsx
@list.last
end
+ # The relationships required by this collection's hyperlinks
+ # @return Array
def relationships
return [] if empty?
map { |hyperlink| hyperlink.relationship }