diff options
| author | Nick Burch <nick@apache.org> | 2008-06-16 13:20:42 +0000 |
|---|---|---|
| committer | Nick Burch <nick@apache.org> | 2008-06-16 13:20:42 +0000 |
| commit | 1704e174fcccf717c17d92b69f39db260f338109 (patch) | |
| tree | 3d93244640f3d09f4dc0c6141e278da92a255f6b /src/java/org/apache/poi | |
| parent | bd44450ddfffff64a06366ceba7808aa68fc6b14 (diff) | |
| download | poi-1704e174fcccf717c17d92b69f39db260f338109.tar.gz poi-1704e174fcccf717c17d92b69f39db260f338109.zip | |
Slight tweak for named ranges pointing at deleted sheets, related to bug #30978
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@668153 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/poi')
| -rw-r--r-- | src/java/org/apache/poi/hssf/model/Workbook.java | 3 | ||||
| -rw-r--r-- | src/java/org/apache/poi/hssf/record/formula/Area3DPtg.java | 11 | ||||
| -rw-r--r-- | src/java/org/apache/poi/hssf/usermodel/HSSFName.java | 1 |
3 files changed, 12 insertions, 3 deletions
diff --git a/src/java/org/apache/poi/hssf/model/Workbook.java b/src/java/org/apache/poi/hssf/model/Workbook.java index d87fc2c632..5b38935f4c 100644 --- a/src/java/org/apache/poi/hssf/model/Workbook.java +++ b/src/java/org/apache/poi/hssf/model/Workbook.java @@ -603,6 +603,9 @@ public class Workbook implements Model boundsheets.remove(sheetnum); fixTabIdRecord(); } + + // If we decide that we need to fix up + // NameRecords, do it here } /** diff --git a/src/java/org/apache/poi/hssf/record/formula/Area3DPtg.java b/src/java/org/apache/poi/hssf/record/formula/Area3DPtg.java index 60911edc72..e8f72e9937 100644 --- a/src/java/org/apache/poi/hssf/record/formula/Area3DPtg.java +++ b/src/java/org/apache/poi/hssf/record/formula/Area3DPtg.java @@ -269,8 +269,15 @@ public class Area3DPtg extends OperandPtg implements AreaI { StringBuffer retval = new StringBuffer(); String sheetName = Ref3DPtg.getSheetName(book, field_1_index_extern_sheet); if(sheetName != null) { - SheetNameFormatter.appendFormat(retval, sheetName); - retval.append( '!' ); + if(sheetName.length() == 0) { + // What excel does if sheet has been deleted + sheetName = "#REF"; + retval.append(sheetName); + } else { + // Normal + SheetNameFormatter.appendFormat(retval, sheetName); + retval.append( '!' ); + } } // Now the normal area bit diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFName.java b/src/java/org/apache/poi/hssf/usermodel/HSSFName.java index e24ca23ea8..240be13f58 100644 --- a/src/java/org/apache/poi/hssf/usermodel/HSSFName.java +++ b/src/java/org/apache/poi/hssf/usermodel/HSSFName.java @@ -18,7 +18,6 @@ package org.apache.poi.hssf.usermodel; import org.apache.poi.hssf.model.Workbook; -import org.apache.poi.hssf.record.BoundSheetRecord; import org.apache.poi.hssf.record.NameRecord; import org.apache.poi.hssf.util.RangeAddress; |