summaryrefslogtreecommitdiffhomepage
path: root/lib
diff options
context:
space:
mode:
authorRandy Morgan <[email protected]>2012-07-20 20:28:07 +0900
committerRandy Morgan <[email protected]>2012-07-20 20:28:07 +0900
commitfd071c1779467ecce47a77993683aa947a62081a (patch)
treeaf44da82db779a3141bf6b1b6a5af110b3fe243a /lib
parent1f20f9450ff75ee5783cbb5d44a86559e6dbe41f (diff)
downloadcaxlsx-fd071c1779467ecce47a77993683aa947a62081a.tar.gz
caxlsx-fd071c1779467ecce47a77993683aa947a62081a.zip
specs for d_lbls and a patch to cover for nil relationships in a worksheet.
Diffstat (limited to 'lib')
-rw-r--r--lib/axlsx/drawing/d_lbls.rb2
-rw-r--r--lib/axlsx/workbook/worksheet/worksheet.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/axlsx/drawing/d_lbls.rb b/lib/axlsx/drawing/d_lbls.rb
index 6682bd07..faf7017d 100644
--- a/lib/axlsx/drawing/d_lbls.rb
+++ b/lib/axlsx/drawing/d_lbls.rb
@@ -23,7 +23,7 @@ module Axlsx
# creates a new DLbls object
def initialize(options={})
- d_lbl_pos = :best_fit
+ @d_lbl_pos = :best_fit
initialize_defaults
options.each do |o|
self.send("#{o[0]}=", o[1]) if self.respond_to? "#{o[0]}="
diff --git a/lib/axlsx/workbook/worksheet/worksheet.rb b/lib/axlsx/workbook/worksheet/worksheet.rb
index bc933f30..f0d733c7 100644
--- a/lib/axlsx/workbook/worksheet/worksheet.rb
+++ b/lib/axlsx/workbook/worksheet/worksheet.rb
@@ -488,7 +488,7 @@ module Axlsx
r = Relationships.new
r + [tables.relationships,
worksheet_comments.relationships,
- worksheet_drawing.relationship].flatten.compact
+ worksheet_drawing.relationship].flatten.compact || []
r
end