From 8a92f65d093830b736437fbcff7628e09badfa20 Mon Sep 17 00:00:00 2001
From: Nick Burch <nick@apache.org>
Date: Wed, 18 Jun 2008 11:35:04 +0000
Subject: [PATCH] A partial fix for bug #30978, but something still remains,
 which seems to be related to changing the ptg

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@669140 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/poi/hssf/model/Workbook.java   |  24 ++++++-
 .../org/apache/poi/hssf/data/30978-alt.xls    | Bin 0 -> 14848 bytes
 .../apache/poi/hssf/usermodel/TestBugs.java   |  62 ++++++++++++++++++
 3 files changed, 84 insertions(+), 2 deletions(-)
 create mode 100644 src/testcases/org/apache/poi/hssf/data/30978-alt.xls

diff --git a/src/java/org/apache/poi/hssf/model/Workbook.java b/src/java/org/apache/poi/hssf/model/Workbook.java
index 5b38935f4..fa22cfb68 100644
--- a/src/java/org/apache/poi/hssf/model/Workbook.java
+++ b/src/java/org/apache/poi/hssf/model/Workbook.java
@@ -604,8 +604,28 @@ public class Workbook implements Model
             fixTabIdRecord();
         }
         
-        // If we decide that we need to fix up
-        //  NameRecords, do it here
+        // Within NameRecords, it's ok to have the formula
+        //  part point at deleted sheets. It's also ok to
+        //  have the ExternSheetNumber point at deleted
+        //  sheets. 
+        // However, the sheet index must be adjusted, or
+        //  excel will break. (Sheet index is either 0 for
+        //  global, or 1 based index to sheet)
+        int sheetNum1Based = sheetnum + 1;
+        for(int i=0; i<getNumNames(); i++) {
+        	NameRecord nr = getNameRecord(i);
+        	
+        	if(nr.getIndexToSheet() == sheetNum1Based) {
+        		// Excel re-writes these to point to no sheet
+        		nr.setEqualsToIndexToSheet((short)0);
+        	} else if(nr.getIndexToSheet() > sheetNum1Based) {
+        		// Bump down by one, so still points
+        		//  at the same sheet
+        		nr.setEqualsToIndexToSheet((short)(
+        				nr.getEqualsToIndexToSheet()-1
+        		));
+        	}
+        }
     }
 
     /**
diff --git a/src/testcases/org/apache/poi/hssf/data/30978-alt.xls b/src/testcases/org/apache/poi/hssf/data/30978-alt.xls
new file mode 100644
index 0000000000000000000000000000000000000000..c591582885aef5e605d28e22c31761b8d74540c5
GIT binary patch
literal 14848
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

literal 0
HcmV?d00001

diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java b/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
index cbe175a0e..ab247b7c8 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
@@ -28,7 +28,10 @@ import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
 
 import org.apache.poi.hssf.HSSFTestDataSamples;
+import org.apache.poi.hssf.model.Workbook;
 import org.apache.poi.hssf.record.EmbeddedObjectRefSubRecord;
+import org.apache.poi.hssf.record.NameRecord;
+import org.apache.poi.hssf.record.formula.DeletedArea3DPtg;
 import org.apache.poi.hssf.util.Region;
 import org.apache.poi.util.TempFile;
 
@@ -989,4 +992,63 @@ public final class TestBugs extends TestCase {
         	fail();
         } catch(FileNotFoundException e) {}
     }
+    
+    /**
+     * Test that we can delete sheets without
+     *  breaking the build in named ranges
+     *  used for printing stuff.
+     * Currently broken, as we change the Ptg
+     */
+    public void BROKENtest30978() throws Exception {
+        HSSFWorkbook wb = openSample("30978-alt.xls");
+        assertEquals(1, wb.getNumberOfNames());
+        assertEquals(3, wb.getNumberOfSheets());
+        
+        // Check all names fit within range, and use
+        //  DeletedArea3DPtg
+        Workbook w = wb.getWorkbook();
+        for(int i=0; i<w.getNumNames(); i++) {
+        	NameRecord r = w.getNameRecord(i);
+        	assertTrue(r.getIndexToSheet() <= wb.getNumberOfSheets());
+        	
+        	List nd = r.getNameDefinition();
+        	assertEquals(1, nd.size());
+        	assertTrue(nd.get(0) instanceof DeletedArea3DPtg);
+        }
+        
+        
+        // Delete the 2nd sheet
+        wb.removeSheetAt(1);
+        
+        
+        // Re-check
+        assertEquals(1, wb.getNumberOfNames());
+        assertEquals(2, wb.getNumberOfSheets());
+        
+        for(int i=0; i<w.getNumNames(); i++) {
+        	NameRecord r = w.getNameRecord(i);
+        	assertTrue(r.getIndexToSheet() <= wb.getNumberOfSheets());
+        	
+        	List nd = r.getNameDefinition();
+        	assertEquals(1, nd.size());
+        	assertTrue(nd.get(0) instanceof DeletedArea3DPtg);
+        }
+        
+        
+        // Save and re-load
+        wb = writeOutAndReadBack(wb);
+        w = wb.getWorkbook();
+        
+        assertEquals(1, wb.getNumberOfNames());
+        assertEquals(2, wb.getNumberOfSheets());
+        
+        for(int i=0; i<w.getNumNames(); i++) {
+        	NameRecord r = w.getNameRecord(i);
+        	assertTrue(r.getIndexToSheet() <= wb.getNumberOfSheets());
+        	
+        	List nd = r.getNameDefinition();
+        	assertEquals(1, nd.size());
+        	assertTrue(nd.get(0) instanceof DeletedArea3DPtg);
+        }
+    }
 }