summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRandy Morgan <[email protected]>2012-03-04 22:32:44 +0900
committerSean Duckett <[email protected]>2012-03-07 14:45:03 -0600
commit7d1a6097fdee39685b98432525c61e32b22c497e (patch)
treeede361ce4b42a8d11d5ff86d09b9cb562312ab41
parent46b53746d467ab6e3d844600e702070fe18b5190 (diff)
downloadcaxlsx-7d1a6097fdee39685b98432525c61e32b22c497e.tar.gz
caxlsx-7d1a6097fdee39685b98432525c61e32b22c497e.zip
remove rubyXL interop and update readme
-rw-r--r--README.md5
-rw-r--r--lib/axlsx/workbook/workbook.rb7
-rw-r--r--lib/axlsx/workbook/worksheet/worksheet.rb13
3 files changed, 13 insertions, 12 deletions
diff --git a/README.md b/README.md
index fff3ee4f..69f8a112 100644
--- a/README.md
+++ b/README.md
@@ -7,10 +7,10 @@ Axlsx: Office Open XML Spreadsheet Generation
**Author**: Randy Morgan
**Copyright**: 2011
**License**: MIT License
-**Latest Version**: 1.0.17
+**Latest Version**: 1.0.18
**Ruby Version**: 1.8.7, 1.9.2, 1.9.3
-**Release Date**: February 14th 2012
+**Release Date**: March 5th 2012
Synopsis
--------
@@ -314,7 +314,6 @@ This gem has 100% test coverage using test/unit. To execute tests for this gem,
- bugfix custom borders are not properly applied when using styles.add_style
- interop worksheet names must be 31 characters or less or some versions of office complain about repairs
- added type support for :boolean and :date types cell values
- - iterop added some elements so that rubyXL can parse sheets generated with axlsx
- added support for fixed column widths
- added support for page_margins
- added << alias for add_row
diff --git a/lib/axlsx/workbook/workbook.rb b/lib/axlsx/workbook/workbook.rb
index a7d830aa..3350b3ff 100644
--- a/lib/axlsx/workbook/workbook.rb
+++ b/lib/axlsx/workbook/workbook.rb
@@ -176,9 +176,10 @@ require 'axlsx/workbook/shared_strings_table.rb'
xml.workbookPr(:date1904=>@@date1904)
#<x:workbookProtection workbookPassword="xsd:hexBinary data" lockStructure="1" lockWindows="1" />
# Required to support rubyXL parsing as it requires sheetView, which requires this.
- xml.bookViews {
- xml.workbookView :activeTab=>0
- }
+ # and removed because it seems to cause some odd [Grouped] behaviour in excel.
+ # xml.bookViews {
+ # xml.workbookView :activeTab=>0
+ # }
xml.sheets {
@worksheets.each_with_index do |sheet, index|
xml.sheet(:name=>sheet.name, :sheetId=>index+1, :"r:id"=>sheet.rId)
diff --git a/lib/axlsx/workbook/worksheet/worksheet.rb b/lib/axlsx/workbook/worksheet/worksheet.rb
index 672ba9e0..679817ce 100644
--- a/lib/axlsx/workbook/worksheet/worksheet.rb
+++ b/lib/axlsx/workbook/worksheet/worksheet.rb
@@ -51,7 +51,6 @@ module Axlsx
# end
# @see PageMargins#initialize
# @return [PageMargins]
- # @yeilds self
def page_margins
@page_margins ||= PageMargins.new
yield @page_margins if block_given?
@@ -336,11 +335,13 @@ module Axlsx
# another patch for the folks at rubyXL as thier parser depends on this optional element.
xml.dimension :ref=>dimension unless rows.size == 0
# this is required by rubyXL, spec says who cares - but it seems they didnt notice
- xml.sheetViews {
- xml.sheetView(:tabSelected => 1, :workbookViewId => 0) {
- xml.selection :activeCell=>"A1", :sqref => "A1"
- }
- }
+ # however, it also seems to be causing some odd [Grouped] stuff in excel 2011 - so
+ # removing until I understand it better.
+ # xml.sheetViews {
+ # xml.sheetView(:tabSelected => 1, :workbookViewId => 0) {
+ # xml.selection :activeCell=>"A1", :sqref => "A1"
+ # }
+ # }
if @auto_fit_data.size > 0
xml.cols {