fix xls/xlsx so they read the row|column defaults

simonoff · Feb 24, 2009 · ce722e6 · ce722e6
1 parent 599e04b
commit ce722e6
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 23 deletions.
diff --git a/test/style.xls b/test/style.xls
diff --git a/test/style.xlsx b/test/style.xlsx
diff --git a/test/test_roo.rb b/test/test_roo.rb
@@ -4907,39 +4907,36 @@ def verify_cell_fonts(oo)
     assert_equal true,  oo.font(7,1).italic?
     assert_equal true,  oo.font(7,1).underline?
 
+    # bolded row
+    assert_equal true, oo.font(8,1).bold?
+    assert_equal false,  oo.font(8,1).italic?
+    assert_equal false,  oo.font(8,1).underline?
 
-
+    # bolded col
+    assert_equal true, oo.font(9,2).bold?
+    assert_equal false,  oo.font(9,2).italic?
+    assert_equal false,  oo.font(9,2).underline?
+
+    # bolded row, italic col
+    assert_equal true, oo.font(10,3).bold?
+    assert_equal true,  oo.font(10,3).italic?
+    assert_equal false,  oo.font(10,3).underline?
+
+    # normal
+    assert_equal false, oo.font(11,4).bold?
+    assert_equal false,  oo.font(11,4).italic?
+    assert_equal false,  oo.font(11,4).underline?
   end
 
   def test_cell_styles  
     if OPENOFFICE
       oo = Openoffice.new(File.join(TESTDIR,"style.ods"))
       verify_cell_fonts(oo)
-
-      # bolded row
-      assert_equal true, oo.font(8,1).bold?
-      assert_equal false,  oo.font(8,1).italic?
-      assert_equal false,  oo.font(8,1).underline?
-
-      # bolded col
-      assert_equal true, oo.font(9,2).bold?
-      assert_equal false,  oo.font(9,2).italic?
-      assert_equal false,  oo.font(9,2).underline?
-
-      # bolded row, italic col
-      assert_equal true, oo.font(10,3).bold?
-      assert_equal true,  oo.font(10,3).italic?
-      assert_equal false,  oo.font(10,3).underline?
-
-      # normal
-      assert_equal false, oo.font(11,4).bold?
-      assert_equal false,  oo.font(11,4).italic?
-      assert_equal false,  oo.font(11,4).underline?       
     end
     if EXCELX
       oo = Excelx.new(File.join(TESTDIR,"style.xlsx"))
-        verify_cell_fonts(oo)
-      end
+      verify_cell_fonts(oo)
+    end
     if EXCEL
       oo = Excel.new(File.join(TESTDIR,"style.xls"))
         verify_cell_fonts(oo)