diff options
| author | Randy Morgan <[email protected]> | 2012-02-14 20:01:12 +0900 |
|---|---|---|
| committer | Randy Morgan <[email protected]> | 2012-02-14 20:01:12 +0900 |
| commit | 501b9f80ec89cbdd01890ba6e66b3fbc849a708a (patch) | |
| tree | 67b2a0affb768f8cd052aa5b687a531e2fc83906 | |
| parent | 8bcc77953262fd934bd4b84daf53d946c576193b (diff) | |
| download | caxlsx-501b9f80ec89cbdd01890ba6e66b3fbc849a708a.tar.gz caxlsx-501b9f80ec89cbdd01890ba6e66b3fbc849a708a.zip | |
Stomp out all warnings.
"Method calls with expanded arrays require parentheses"
Thanks rspec - I didn't know that.
| -rw-r--r-- | examples/example.rb | 4 | ||||
| -rw-r--r-- | lib/axlsx/drawing/chart.rb | 4 | ||||
| -rw-r--r-- | lib/axlsx/drawing/pic.rb | 1 | ||||
| -rw-r--r-- | lib/axlsx/package.rb | 4 | ||||
| -rw-r--r-- | lib/axlsx/workbook/worksheet/cell.rb | 4 | ||||
| -rw-r--r-- | lib/axlsx/workbook/worksheet/worksheet.rb | 1 |
6 files changed, 11 insertions, 7 deletions
diff --git a/examples/example.rb b/examples/example.rb index b06f0544..cedf4ace 100644 --- a/examples/example.rb +++ b/examples/example.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env ruby -w -s # -*- coding: utf-8 -*- require 'axlsx.rb' @@ -61,7 +61,7 @@ ##Asian Language Support - wb.add_worksheet(:name => "Unicode Support") do |sheet| + wb.add_worksheet(:name => "日本語でのシート名") do |sheet| sheet.add_row ["日本語"] sheet.add_row ["华语/華語"] sheet.add_row ["한국어/조선말"] diff --git a/lib/axlsx/drawing/chart.rb b/lib/axlsx/drawing/chart.rb index d3c26692..831dff8b 100644 --- a/lib/axlsx/drawing/chart.rb +++ b/lib/axlsx/drawing/chart.rb @@ -52,8 +52,8 @@ module Axlsx options.each do |o| self.send("#{o[0]}=", o[1]) if self.respond_to? "#{o[0]}=" end - start_at *options[:start_at] if options[:start_at] - end_at *options[:end_at] if options[:start_at] + start_at(*options[:start_at]) if options[:start_at] + end_at(*options[:end_at]) if options[:start_at] yield self if block_given? end diff --git a/lib/axlsx/drawing/pic.rb b/lib/axlsx/drawing/pic.rb index b922bcc4..754a7e35 100644 --- a/lib/axlsx/drawing/pic.rb +++ b/lib/axlsx/drawing/pic.rb @@ -39,6 +39,7 @@ module Axlsx # @option options [Intger] height def initialize(anchor, options={}) @anchor = anchor + @hyperlink = nil @anchor.drawing.worksheet.workbook.images << self options.each do |o| self.send("#{o[0]}=", o[1]) if self.respond_to? "#{o[0]}=" diff --git a/lib/axlsx/package.rb b/lib/axlsx/package.rb index 3d33d0e2..5548dd62 100644 --- a/lib/axlsx/package.rb +++ b/lib/axlsx/package.rb @@ -110,8 +110,8 @@ module Axlsx # This is not ready yet def encrypt(file_name, password) return false - moc = MsOffCrypto.new(file_name, password) - moc.save + # moc = MsOffCrypto.new(file_name, password) + # moc.save end # Validate all parts of the package against xsd schema. diff --git a/lib/axlsx/workbook/worksheet/cell.rb b/lib/axlsx/workbook/worksheet/cell.rb index 5ca5b759..9e4dbdc2 100644 --- a/lib/axlsx/workbook/worksheet/cell.rb +++ b/lib/axlsx/workbook/worksheet/cell.rb @@ -184,6 +184,8 @@ module Axlsx # @option options [Symbol] scheme must be one of :none, major, :minor def initialize(row, value="", options={}) self.row=row + @font_name = @charset = @family = @b = @i = @strike = @outline = @shadow = nil + @condense = @u = @vertAlign = @sz = @color = @scheme = @extend = @ssti = nil @styles = row.worksheet.workbook.styles @row.cells << self options.each do |o| @@ -278,7 +280,7 @@ module Axlsx xml.sz(:val=>@sz) if @sz xml.u(:val=>@u) if @u # :baseline, :subscript, :superscript - xml.vertAlign(:val=>@vertAlign) if @verAlign + xml.vertAlign(:val=>@vertAlign) if @vertAlign # :none, major, :minor xml.scheme(:val=>@scheme) if @scheme } diff --git a/lib/axlsx/workbook/worksheet/worksheet.rb b/lib/axlsx/workbook/worksheet/worksheet.rb index 16aeffa1..3c310260 100644 --- a/lib/axlsx/workbook/worksheet/worksheet.rb +++ b/lib/axlsx/workbook/worksheet/worksheet.rb @@ -41,6 +41,7 @@ module Axlsx # @option options [String] name The name of this sheet. def initialize(wb, options={}) @drawing = nil + @auto_filter = nil @rows = SimpleTypedList.new Row self.workbook = wb @workbook.worksheets << self |
