You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2019/09/12 20:04:50 UTC
svn commit: r1866862 - in /poi/trunk/src: integrationtest/log4j.properties
java/org/apache/poi/util/JvmBugs.java
testcases/org/apache/poi/ss/usermodel/BaseTestSheetAutosizeColumn.java
Author: kiwiwings
Date: Thu Sep 12 20:04:50 2019
New Revision: 1866862
URL: http://svn.apache.org/viewvc?rev=1866862&view=rev
Log:
remove obsolete JDK6 workarounds
Removed:
poi/trunk/src/java/org/apache/poi/util/JvmBugs.java
Modified:
poi/trunk/src/integrationtest/log4j.properties
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetAutosizeColumn.java
Modified: poi/trunk/src/integrationtest/log4j.properties
URL: http://svn.apache.org/viewvc/poi/trunk/src/integrationtest/log4j.properties?rev=1866862&r1=1866861&r2=1866862&view=diff
==============================================================================
--- poi/trunk/src/integrationtest/log4j.properties (original)
+++ poi/trunk/src/integrationtest/log4j.properties Thu Sep 12 20:04:50 2019
@@ -30,7 +30,6 @@ log4j.logger.org.apache.poi.hdgf.chunks.
log4j.logger.org.apache.poi.hpsf.CodePageString=ERROR
log4j.logger.org.apache.poi.hdgf.chunks.ChunkFactory=ERROR
log4j.logger.org.apache.poi.hslf.model.textproperties.BitMaskTextProp=ERROR
-log4j.logger.org.apache.poi.util.JvmBugs=ERROR
log4j.logger.org.apache.poi.hslf.usermodel.HSLFTextParagraph=ERROR
log4j.logger.org.apache.poi.openxml4j.opc.ZipPackage=ERROR
log4j.logger.org.apache.poi.POIDocument=WARN
Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetAutosizeColumn.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetAutosizeColumn.java?rev=1866862&r1=1866861&r2=1866862&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetAutosizeColumn.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetAutosizeColumn.java Thu Sep 12 20:04:50 2019
@@ -25,7 +25,6 @@ import java.util.Locale;
import org.apache.poi.ss.ITestDataProvider;
import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.util.JvmBugs;
import org.apache.poi.util.LocaleUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -64,7 +63,6 @@ public abstract class BaseTestSheetAutos
@Test
public void numericCells() throws Exception {
Workbook workbook = _testDataProvider.createWorkbook();
- fixFonts(workbook);
DataFormat df = workbook.getCreationHelper().createDataFormat();
Sheet sheet = workbook.createSheet();
trackColumnsForAutoSizingIfSXSSF(sheet);
@@ -107,7 +105,6 @@ public abstract class BaseTestSheetAutos
@Test
public void booleanCells() throws Exception {
Workbook workbook = _testDataProvider.createWorkbook();
- fixFonts(workbook);
Sheet sheet = workbook.createSheet();
trackColumnsForAutoSizingIfSXSSF(sheet);
@@ -139,7 +136,6 @@ public abstract class BaseTestSheetAutos
@Test
public void dateCells() throws Exception {
Workbook workbook = _testDataProvider.createWorkbook();
- fixFonts(workbook);
Sheet sheet = workbook.createSheet();
trackColumnsForAutoSizingIfSXSSF(sheet);
DataFormat df = workbook.getCreationHelper().createDataFormat();
@@ -207,7 +203,6 @@ public abstract class BaseTestSheetAutos
@Test
public void stringCells() throws Exception {
Workbook workbook = _testDataProvider.createWorkbook();
- fixFonts(workbook);
Sheet sheet = workbook.createSheet();
trackColumnsForAutoSizingIfSXSSF(sheet);
Row row = sheet.createRow(0);
@@ -234,8 +229,7 @@ public abstract class BaseTestSheetAutos
assertTrue(2*sheet.getColumnWidth(0) < sheet.getColumnWidth(1)); // width is roughly proportional to the number of characters
assertTrue(2*sheet.getColumnWidth(1) < sheet.getColumnWidth(2));
assertEquals(sheet.getColumnWidth(4), sheet.getColumnWidth(3));
- boolean ignoreFontSizeX2 = JvmBugs.hasLineBreakMeasurerBug();
- assertTrue(ignoreFontSizeX2 || sheet.getColumnWidth(5) > sheet.getColumnWidth(4)); //larger font results in a wider column width
+ assertTrue(sheet.getColumnWidth(5) > sheet.getColumnWidth(4)); //larger font results in a wider column width
workbook.close();
}
@@ -243,7 +237,6 @@ public abstract class BaseTestSheetAutos
@Test
public void rotatedText() throws Exception {
Workbook workbook = _testDataProvider.createWorkbook();
- fixFonts(workbook);
Sheet sheet = workbook.createSheet();
trackColumnsForAutoSizingIfSXSSF(sheet);
Row row = sheet.createRow(0);
@@ -271,7 +264,6 @@ public abstract class BaseTestSheetAutos
@Test
public void mergedCells() throws Exception {
Workbook workbook = _testDataProvider.createWorkbook();
- fixFonts(workbook);
Sheet sheet = workbook.createSheet();
trackColumnsForAutoSizingIfSXSSF(sheet);
@@ -299,7 +291,6 @@ public abstract class BaseTestSheetAutos
@Test
public void largeRowNumbers() throws Exception {
Workbook workbook = _testDataProvider.createWorkbook();
- fixFonts(workbook);
Sheet sheet = workbook.createSheet();
trackColumnsForAutoSizingIfSXSSF(sheet);
@@ -350,16 +341,4 @@ public abstract class BaseTestSheetAutos
}
}
}
-
- protected static void fixFonts(Workbook workbook) {
- if (!JvmBugs.hasLineBreakMeasurerBug()) return;
- for (int i=workbook.getNumberOfFontsAsInt()-1; i>=0; i--) {
- Font f = workbook.getFontAt(0);
- if ("Calibri".equals(f.getFontName())) {
- f.setFontName("Lucida Sans");
- } else if ("Cambria".equals(f.getFontName())) {
- f.setFontName("Lucida Bright");
- }
- }
- }
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org