svn commit: r1763484 - in /poi/trunk/src: java/org/apache/poi/hssf/usermodel/HSSFRow.java testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java

[centic]

Author: centic
Date: Wed Oct  5 19:59:56 2016
New Revision: 1763484

URL: http://svn.apache.org/viewvc?rev=1763484&view=rev
Log:
Bug 53028: Broken auto fit row height in the cells with word wrap

Modified:
    poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java
    poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java

Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java?rev=1763484&r1=1763483&r2=1763484&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java Wed Oct  5 
19:59:56 2016
@@ -499,6 +499,7 @@ public final class HSSFRow implements Ro
     {
         if(height == -1){
             row.setHeight((short)(0xFF | 0x8000));
+            row.setBadFontHeight(false);
         } else {
             row.setBadFontHeight(true);
             row.setHeight((short) (height * 20));

Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java?rev=1763484&r1=1763483&r2=1763484&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java 
(original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java Wed 
Oct  5 19:59:56 2016
@@ -17,11 +17,6 @@
 
 package org.apache.poi.hssf.usermodel;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-
 import java.io.IOException;
 
 import org.apache.poi.hssf.HSSFITestDataProvider;
@@ -31,6 +26,8 @@ import org.apache.poi.ss.SpreadsheetVers
 import org.apache.poi.ss.usermodel.BaseTestRow;
 import org.junit.Test;
 
+import static org.junit.Assert.*;
+
 /**
  * Test HSSFRow is okay.
  *
@@ -42,10 +39,12 @@ public final class TestHSSFRow extends B
         super(HSSFITestDataProvider.instance);
     }
 
+    @Test
     public void testRowBounds() throws IOException {
         baseTestRowBounds(SpreadsheetVersion.EXCEL97.getLastRowIndex());
     }
 
+    @Test
     public void testCellBounds() throws IOException {
         baseTestCellBounds(SpreadsheetVersion.EXCEL97.getLastColumnIndex());
     }
@@ -136,16 +135,28 @@ public final class TestHSSFRow extends B
         HSSFRow row = sheet.createRow(0);
 
         assertEquals(row.getHeight(), sheet.getDefaultRowHeight());
-        assertEquals(row.getRowRecord().getBadFontHeight(), false);
+        assertFalse(row.getRowRecord().getBadFontHeight());
 
         row.setHeight((short) 123);
-        assertEquals(row.getHeight(), 123);
-        assertEquals(row.getRowRecord().getBadFontHeight(), true);
+        assertEquals(123, row.getHeight());
+        assertTrue(row.getRowRecord().getBadFontHeight());
 
         row.setHeight((short) -1);
         assertEquals(row.getHeight(), sheet.getDefaultRowHeight());
-        assertEquals(row.getRowRecord().getBadFontHeight(), false);
-        
+        assertFalse(row.getRowRecord().getBadFontHeight());
+
+        row.setHeight((short) 123);
+        assertEquals(123, row.getHeight());
+        assertTrue(row.getRowRecord().getBadFontHeight());
+
+        row.setHeightInPoints(-1);
+        assertEquals(row.getHeight(), sheet.getDefaultRowHeight());
+        assertFalse(row.getRowRecord().getBadFontHeight());
+
+        row.setHeightInPoints(432);
+        assertEquals(432*20, row.getHeight());
+        assertTrue(row.getRowRecord().getBadFontHeight());
+
         workbook.close();
     }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org