You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ni...@apache.org on 2014/07/25 12:10:52 UTC
svn commit: r1613374 -
/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationWorkbook.java
Author: nick
Date: Fri Jul 25 10:10:52 2014
New Revision: 1613374
URL: http://svn.apache.org/r1613374
Log:
Refactor to reduce clutter
Modified:
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationWorkbook.java
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationWorkbook.java?rev=1613374&r1=1613373&r2=1613374&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationWorkbook.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationWorkbook.java Fri Jul 25 10:10:52 2014
@@ -30,7 +30,6 @@ import org.apache.poi.ss.formula.Formula
import org.apache.poi.ss.formula.FormulaParsingWorkbook;
import org.apache.poi.ss.formula.FormulaRenderingWorkbook;
import org.apache.poi.ss.formula.FormulaType;
-import org.apache.poi.ss.formula.NameIdentifier;
import org.apache.poi.ss.formula.SheetIdentifier;
import org.apache.poi.ss.formula.SheetRangeIdentifier;
import org.apache.poi.ss.formula.ptg.Area3DPtg;
@@ -71,24 +70,6 @@ public final class HSSFEvaluationWorkboo
public int getExternalSheetIndex(String workbookName, String sheetName) {
return _iBook.getExternalSheetIndex(workbookName, sheetName);
}
- public int getExternalSheetIndex(String workbookName, String firstSheetName, String lastSheetName) {
- return _iBook.getExternalSheetIndex(workbookName, firstSheetName, lastSheetName);
- }
-
- public int getExternalSheetIndex(String workbookName, NameIdentifier sheetName) {
- return getExternalSheetIndex(workbookName, sheetName.getName());
- }
- public int getExternalSheetIndex(String workbookName, NameIdentifier firstSheetName, NameIdentifier lastSheetName) {
- return getExternalSheetIndex(workbookName, firstSheetName.getName(), lastSheetName.getName());
- }
- public int getExternalSheetIndex(NameIdentifier sheetName) {
- return getExternalSheetIndex(sheetName.getName());
- }
- public int getExternalSheetIndex(NameIdentifier firstSheetName, NameIdentifier lastSheetName) {
- int firstSheetIndex = _uBook.getSheetIndex(firstSheetName.getName());
- int lastSheetIndex = _uBook.getSheetIndex(lastSheetName.getName());
- return _iBook.checkExternSheet(firstSheetIndex, lastSheetIndex);
- }
public Ptg get3DReferencePtg(CellReference cr, SheetIdentifier sheet) {
int extIx = getSheetExtIx(sheet);
@@ -255,25 +236,20 @@ public final class HSSFEvaluationWorkboo
if (sheetIden == null) {
extIx = -1;
} else {
- NameIdentifier sheetName = sheetIden.getSheetIdentifier();
- NameIdentifier lastSheetName = null;
+ String workbookName = sheetIden.getBookName();
+ String firstSheetName = sheetIden.getSheetIdentifier().getName();
+ String lastSheetName = firstSheetName;
if (sheetIden instanceof SheetRangeIdentifier) {
- lastSheetName = ((SheetRangeIdentifier)sheetIden).getLastSheetIdentifier();
+ lastSheetName = ((SheetRangeIdentifier)sheetIden).getLastSheetIdentifier().getName();
}
- if (sheetIden.getBookName() == null) {
- if (lastSheetName == null) {
- extIx = getExternalSheetIndex(sheetName);
- } else {
- extIx = getExternalSheetIndex(sheetName, lastSheetName);
- }
+ if (workbookName == null) {
+ int firstSheetIndex = _uBook.getSheetIndex(firstSheetName);
+ int lastSheetIndex = _uBook.getSheetIndex(lastSheetName);
+ extIx = _iBook.checkExternSheet(firstSheetIndex, lastSheetIndex);
} else {
- if (lastSheetName == null) {
- extIx = getExternalSheetIndex(sheetIden.getBookName(), sheetName);
- } else {
- extIx = getExternalSheetIndex(sheetIden.getBookName(), sheetName, lastSheetName);
- }
+ extIx = _iBook.getExternalSheetIndex(workbookName, firstSheetName, lastSheetName);
}
}
return extIx;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org