moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

The Event User Model fake-workbook for formula evaluations needs to know about the sheet names

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1611946 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2014-07-19 19:10:47 +00:00
parent fbcf64087d
commit c392b4fa72
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/java/org/apache/poi/hssf/eventusermodel/EventWorkbookBuilder.java
View File

@ -138,7 +138,14 @@ public class EventWorkbookBuilder {
}
public HSSFWorkbook getStubHSSFWorkbook() {
return HSSFWorkbook.create(getStubWorkbook());
// Create a base workbook
HSSFWorkbook wb = HSSFWorkbook.create(getStubWorkbook());
// Stub the sheets, so sheet name lookups work
for (BoundSheetRecord bsr : boundSheetRecords) {
wb.createSheet(bsr.getSheetname());
}
// Ready for Formula use!
return wb;
}
public InternalWorkbook getStubWorkbook() {
return createStubWorkbook(

11
src/java/org/apache/poi/ss/formula/ptg/ExternSheetNameResolver.java
View File

@ -17,8 +17,8 @@
package org.apache.poi.ss.formula.ptg;
import org.apache.poi.ss.formula.FormulaRenderingWorkbook;
import org.apache.poi.ss.formula.EvaluationWorkbook.ExternalSheet;
import org.apache.poi.ss.formula.FormulaRenderingWorkbook;
import org.apache.poi.ss.formula.SheetNameFormatter;
/**
@ -36,8 +36,13 @@ final class ExternSheetNameResolver {
if (externalSheet != null) {
String wbName = externalSheet.getWorkbookName();
String sheetName = externalSheet.getSheetName();
sb = new StringBuffer(wbName.length() + sheetName.length() + cellRefText.length() + 4);
SheetNameFormatter.appendFormat(sb, wbName, sheetName);
if (wbName != null) {
sb = new StringBuffer(wbName.length() + sheetName.length() + cellRefText.length() + 4);
SheetNameFormatter.appendFormat(sb, wbName, sheetName);
} else {
sb = new StringBuffer(sheetName.length() + cellRefText.length() + 4);
SheetNameFormatter.appendFormat(sb, sheetName);
}
} else {
String sheetName = book.getSheetNameByExternSheet(field_1_index_extern_sheet);
sb = new StringBuffer(sheetName.length() + cellRefText.length() + 4);

7
src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java
View File

@ -97,8 +97,11 @@ public final class TestEventWorkbookBuilder extends TestCase {
// Check these stubs have the right stuff on them
assertEquals("Sheet1", stubWB.getSheetName(0));
assertEquals("S2", stubWB.getSheetName(1));
assertEquals("Sh3", stubWB.getSheetName(2));
assertEquals("Sheet1", stubHSSF.getSheetName(0));
assertEquals("S2", stubWB.getSheetName(1));
assertEquals("S2", stubHSSF.getSheetName(1));
assertEquals("Sh3", stubWB.getSheetName(2));
assertEquals("Sh3", stubHSSF.getSheetName(2));
// Check we can get the formula without breaking
for(int i=0; i<fRecs.length; i++) {