summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRandy Morgan <[email protected]>2012-07-07 18:51:46 +0900
committerRandy Morgan <[email protected]>2012-07-07 18:51:46 +0900
commitfb4f5feb9d38ee49142a18eb6a1921fd3567964f (patch)
tree2a66b259e4807348a026e39284ebf78f57e205f2
parent4c46ee219862e6a5badf47b6df008b1bea0088d5 (diff)
downloadcaxlsx-fb4f5feb9d38ee49142a18eb6a1921fd3567964f.tar.gz
caxlsx-fb4f5feb9d38ee49142a18eb6a1921fd3567964f.zip
fixing a type in worksheet serialization and adding in a few missing alias calls for the great snake_case move
-rwxr-xr-xexamples/example.rb4
-rw-r--r--lib/axlsx/doc_props/app.rb4
-rw-r--r--lib/axlsx/doc_props/core.rb1
-rw-r--r--lib/axlsx/workbook/worksheet/worksheet.rb2
4 files changed, 7 insertions, 4 deletions
diff --git a/examples/example.rb b/examples/example.rb
index bd32e98b..00051af0 100755
--- a/examples/example.rb
+++ b/examples/example.rb
@@ -321,7 +321,7 @@ wb.add_worksheet(:name => "fit to page") do |sheet|
sheet.add_row ['this all goes on one page']
sheet.fit_to_page = true
end
-#```
+##```
##Hide Gridlines in worksheet
@@ -331,7 +331,7 @@ wb.add_worksheet(:name => "No Gridlines") do |sheet|
sheet.add_row ["This", "Sheet", "Hides", "Gridlines"]
sheet.show_gridlines = false
end
-#```
+##```
# Sheet Protection and excluding cells from locking.
diff --git a/lib/axlsx/doc_props/app.rb b/lib/axlsx/doc_props/app.rb
index 73bb6599..0d3968cd 100644
--- a/lib/axlsx/doc_props/app.rb
+++ b/lib/axlsx/doc_props/app.rb
@@ -133,13 +133,15 @@ module Axlsx
# Sets the template property of your app.xml file
def template=(v) Axlsx::validate_string v; @template = v; end
+ alias :Template :template
# Sets the manager property of your app.xml file
def manager=(v) Axlsx::validate_string v; @manager = v; end
+ alias :Manager :manager
# Sets the company property of your app.xml file
def company=(v) Axlsx::validate_string v; @company = v; end
-
+ alias :Company :company
# Sets the pages property of your app.xml file
def pages=(v) Axlsx::validate_int v; @pages = v; end
diff --git a/lib/axlsx/doc_props/core.rb b/lib/axlsx/doc_props/core.rb
index d894c73c..0b62aa7c 100644
--- a/lib/axlsx/doc_props/core.rb
+++ b/lib/axlsx/doc_props/core.rb
@@ -4,6 +4,7 @@ module Axlsx
# @note Packages manage their own core object.
# @see Package#core
class Core
+ #
# The author of the document. By default this is 'axlsx'
# @return [String]
attr_accessor :creator
diff --git a/lib/axlsx/workbook/worksheet/worksheet.rb b/lib/axlsx/workbook/worksheet/worksheet.rb
index eb6b73ed..6a53e2ca 100644
--- a/lib/axlsx/workbook/worksheet/worksheet.rb
+++ b/lib/axlsx/workbook/worksheet/worksheet.rb
@@ -582,7 +582,7 @@ module Axlsx
return '' if @merged_cells.size == 0
str = "<mergeCells count='#{@merged_cells.size}'>"
@merged_cells.each { |merged_cell| str << "<mergeCell ref='#{merged_cell}'></mergeCell>" }
- str << '</mergedCells>'
+ str << '</mergeCells>'
end
# Helper method for parsing out the drawing node