Merge 1c1bd6e585 into eccb6983b7

poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java

@@ -142,7 +142,7 @@ public class ExcelToHtmlConverter extends AbstractExcelConverter {
     public static Document process(HSSFWorkbook workbook) throws IOException, ParserConfigurationException {
         ExcelToHtmlConverter excelToHtmlConverter = new ExcelToHtmlConverter(
             XMLHelper.newDocumentBuilder().newDocument());
-        excelToHtmlConverter.processWorkbook(workbook);
+        excelToHtmlConverter.processWorkbookSheet(workbook);
         return excelToHtmlConverter.getDocument();
     }
 
@@ -674,7 +674,7 @@ public class ExcelToHtmlConverter extends AbstractExcelConverter {
         htmlBody.appendChild(h2);
     }
 
-    public void processWorkbook(HSSFWorkbook workbook) {
+    public void processWorkbookSheet(HSSFWorkbook workbook) {
         final SummaryInformation summaryInformation = workbook
             .getSummaryInformation();
         if (summaryInformation != null) {
@@ -698,6 +698,24 @@ public class ExcelToHtmlConverter extends AbstractExcelConverter {
         htmlDocumentFacade.updateStylesheet();
     }
 
+    public void processWorkbookSheet(HSSFWorkbook workbook, int sheetNumber) {
+        SummaryInformation summaryInformation = workbook.getSummaryInformation();
+
+        if (summaryInformation != null) {
+            this.processDocumentInformation(summaryInformation);
+        }
+
+        if (workbook.getNumberOfSheets() < sheetNumber) {
+            throw new IllegalArgumentException("invalid sheet number: " + sheetNumber);
+        }
+
+        HSSFSheet sheet = workbook.getSheetAt(sheetNumber);
+
+        this.processSheet(sheet);
+
+        htmlDocumentFacade.updateStylesheet();
+    }
+
     public void setCssClassPrefixCell(String cssClassPrefixCell) {
         this.cssClassPrefixCell = cssClassPrefixCell;
     }

poi-scratchpad/src/test/java/org/apache/poi/hssf/converter/TestExcelConverterSuite.java

@@ -32,6 +32,7 @@ import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
 import org.apache.poi.POIDataSamples;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.util.XMLHelper;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -65,6 +66,7 @@ public class TestExcelConverterSuite {
     void testFo(File child) throws Exception
     {
         HSSFWorkbook workbook;
+        int sheetNumber = 0;
         try {
             workbook = AbstractExcelUtils.loadXls( child );
         } catch ( Exception exc ) {
@@ -74,7 +76,8 @@ public class TestExcelConverterSuite {
 
         ExcelToHtmlConverter excelToHtmlConverter = new ExcelToHtmlConverter(
                 XMLHelper.newDocumentBuilder().newDocument() );
-        excelToHtmlConverter.processWorkbook( workbook );
+        excelToHtmlConverter.processWorkbookSheet( workbook);
+        excelToHtmlConverter.processWorkbookSheet( workbook, sheetNumber);
 
         StringWriter stringWriter = new StringWriter();
 
@@ -91,6 +94,8 @@ public class TestExcelConverterSuite {
     void testHtml(File child) throws Exception
     {
         HSSFWorkbook workbook;
+        int sheetNumber = 0; //
+
         try {
             workbook = AbstractExcelUtils.loadXls( child );
         } catch ( Exception exc ) {
@@ -100,7 +105,8 @@ public class TestExcelConverterSuite {
 
         ExcelToHtmlConverter excelToHtmlConverter = new ExcelToHtmlConverter(
                 XMLHelper.newDocumentBuilder().newDocument() );
-        excelToHtmlConverter.processWorkbook( workbook );
+        excelToHtmlConverter.processWorkbookSheet( workbook);
+        excelToHtmlConverter.processWorkbookSheet( workbook, sheetNumber);
 
         StringWriter stringWriter = new StringWriter();