Merge pull request #1703 from antony-liu/poi/v4.0-patch6

Some patches from poi

Author: tonyqus

OpenXmlFormats/Spreadsheet/Sheet.cs

@@ -5805,6 +5805,97 @@ public static CT_HeaderFooter Parse(XmlNode node, XmlNamespaceManager namespaceM
             return ctObj;
         }
 
+        public bool IsSetAlignWithMargins()
+        {
+            return !this.alignWithMargins;
+        }
+
+        public bool IsSetDifferentFirst()
+        {
+            return this.differentFirst;
+        }
+
+        public bool IsSetDifferentOddEven()
+        {
+            return this.differentOddEven;
+        }
+
+        public bool IsSetEvenFooter()
+        {
+            return this.evenFooter != null;
+        }
+
+        public bool IsSetEvenHeader()
+        {
+            return this.evenHeader != null;
+        }
+
+        public bool IsSetFirstFooter()
+        {
+            return this.firstFooter != null;
+        }
+
+        public bool IsSetFirstHeader()
+        {
+            return this.firstHeader != null;
+        }
+
+        public bool IsSetScaleWithDoc()
+        {
+            return !this.scaleWithDoc;
+        }
+
+        public void UnsetScaleWithDoc()
+        {
+            this.scaleWithDoc = true;
+        }
+
+        public void UnsetAlignWithMargins()
+        {
+            this.alignWithMargins = true;
+        }
+
+        public void UnsetDifferentFirst()
+        {
+            this.differentFirst = false;
+        }
+
+        public void UnsetDifferentOddEven()
+        {
+            this.differentOddEven = false;
+        }
+
+        public void UnsetEvenFooter()
+        {
+            this.evenFooter = null;
+        }
+
+        public void UnsetEvenHeader()
+        {
+            this.evenHeader = null;
+        }
+
+        public void UnsetFirstFooter()
+        {
+            this.firstFooter = null;
+        }
+
+        public void UnsetFirstHeader()
+        {
+            this.firstHeader = null;
+        }
+
+        public void UnsetOddFooter()
+        {
+            this.oddFooter = null;
+        }
+
+        public void UnsetOddHeader()
+        {
+            this.oddHeader = null;
+        }
+
+
         internal void Write(StreamWriter sw, string nodeName)
         {
             sw.WriteStart(nodeName);

OpenXmlFormats/Spreadsheet/Sheet/CT_SheetData.cs

@@ -107,6 +107,10 @@ public CT_Row GetRowArray(int index)
         {
             return (null == rowField) ? null : rowField[index];
         }
+        public List<CT_Row> GetRowArray()
+        {
+            return row;
+        }
         [XmlElement("row")]
         public List<CT_Row> row
         {

main/HSSF/UserModel/HSSFEvaluationSheet.cs

@@ -29,10 +29,12 @@ public class HSSFEvaluationSheet : IEvaluationSheet
     {
 
         private readonly HSSFSheet _hs;
+        private int _lastDefinedRow = -1;
 
         public HSSFEvaluationSheet(HSSFSheet hs)
         {
             _hs = hs;
+            _lastDefinedRow = _hs.LastRowNum;
         }
 
         public HSSFSheet HSSFSheet
@@ -42,6 +44,19 @@ public HSSFSheet HSSFSheet
                 return _hs;
             }
         }
+
+        /* (non-Javadoc)
+         * @see org.apache.poi.ss.formula.EvaluationSheet#getlastRowNum()
+         * @since POI 4.0.0
+         */
+        public int LastRowNum
+        {
+            get
+            {
+                return _lastDefinedRow;
+            }
+        }
+
         public IEvaluationCell GetCell(int rowIndex, int columnIndex)
         {
             HSSFRow row = (HSSFRow)_hs.GetRow(rowIndex);
@@ -59,7 +74,7 @@ public IEvaluationCell GetCell(int rowIndex, int columnIndex)
 
         public void ClearAllCachedResultValues()
         {
-            // nothing to do
+            _lastDefinedRow = _hs.LastRowNum;
         }
     }
 }

main/SS/Formula/CellEvaluationFrame.cs

@@ -71,13 +71,13 @@ private CellCacheEntry[] GetSensitiveInputCells()
             }
             return _sensitiveInputCells.ToArray();
         }
-        public void AddUsedBlankCell(int bookIndex, int sheetIndex, int rowIndex, int columnIndex)
+        public void AddUsedBlankCell(IEvaluationWorkbook evalWorkbook, int bookIndex, int sheetIndex, int rowIndex, int columnIndex)
         {
             if (_usedBlankCellGroup == null)
             {
                 _usedBlankCellGroup = new FormulaUsedBlankCellSet();
             }
-            _usedBlankCellGroup.AddCell(bookIndex, sheetIndex, rowIndex, columnIndex);
+            _usedBlankCellGroup.AddCell(evalWorkbook, bookIndex, sheetIndex, rowIndex, columnIndex);
         }
 
         public void UpdateFormulaResult(ValueEval result)

main/SS/Formula/Eval/Forked/ForkedEvaluationSheet.cs

@@ -47,6 +47,18 @@ public ForkedEvaluationSheet(IEvaluationSheet masterSheet)
             _sharedCellsByRowCol = new Dictionary<RowColKey, ForkedEvaluationCell>();
         }
 
+        /* (non-Javadoc)
+         * @see org.apache.poi.ss.formula.EvaluationSheet#getlastRowNum()
+         * @since POI 4.0.0
+         */
+        public int LastRowNum
+        {
+            get
+            {
+                return _masterSheet.LastRowNum;
+            }
+        }
+
         public IEvaluationCell GetCell(int rowIndex, int columnIndex)
         {
             RowColKey key = new RowColKey(rowIndex, columnIndex);

main/SS/Formula/EvaluationSheet.cs

@@ -39,5 +39,11 @@ public interface IEvaluationSheet
          * @see EvaluationWorkbook#clearAllCachedResultValues()
          */
         void ClearAllCachedResultValues();
+
+        /**
+         * @return last row index referenced on this sheet, for evaluation optimization
+         * @since POI 4.0.0
+         */
+        public int LastRowNum { get; }
     }
 }

main/SS/Formula/EvaluationTracker.cs

@@ -133,7 +133,7 @@ public void AcceptFormulaDependency(CellCacheEntry cce)
             }
         }
 
-        public void AcceptPlainValueDependency(int bookIndex, int sheetIndex,
+        public void AcceptPlainValueDependency(IEvaluationWorkbook evalWorkbook, int bookIndex, int sheetIndex,
                 int rowIndex, int columnIndex, ValueEval value)
         {
             // Tell the currently evaluating cell frame that it Has a dependency on the specified
@@ -147,7 +147,7 @@ public void AcceptPlainValueDependency(int bookIndex, int sheetIndex,
                 CellEvaluationFrame consumingFrame = (CellEvaluationFrame)_evaluationFrames[prevFrameIndex];
                 if (value == BlankEval.instance)
                 {
-                    consumingFrame.AddUsedBlankCell(bookIndex, sheetIndex, rowIndex, columnIndex);
+                    consumingFrame.AddUsedBlankCell(evalWorkbook, bookIndex, sheetIndex, rowIndex, columnIndex);
                 }
                 else
                 {

main/SS/Formula/FormulaShifter.cs

@@ -305,7 +305,7 @@ private Ptg AdjustPtgDueToRowMove(Ptg ptg, int currentExternSheetIx)
             if (ptg is Ref3DPxg rpxg)
             {
                 if (rpxg.ExternalWorkbookNumber > 0 ||
-                       !_sheetName.Equals(rpxg.SheetName))
+                       !_sheetName.Equals(rpxg.SheetName, StringComparison.OrdinalIgnoreCase))
                 {
                     // only move 3D refs that refer to the sheet with cells
                     // being moved
@@ -341,7 +341,7 @@ private Ptg AdjustPtgDueToRowMove(Ptg ptg, int currentExternSheetIx)
             if (ptg is Area3DPxg apxg)
             {
                 if (apxg.ExternalWorkbookNumber > 0 ||
-                        !_sheetName.Equals(apxg.SheetName))
+                        !_sheetName.Equals(apxg.SheetName, StringComparison.OrdinalIgnoreCase))
                 {
                     // only move 3D refs that refer to the sheet with cells
                     // being moved
@@ -390,7 +390,7 @@ private Ptg AdjustPtgDueToColumnMove(Ptg ptg, int currentExternSheetIx)
             if (ptg is Ref3DPxg rpxg)
             {
                 if (rpxg.ExternalWorkbookNumber > 0 ||
-                       !_sheetName.Equals(rpxg.SheetName))
+                       !_sheetName.Equals(rpxg.SheetName, StringComparison.OrdinalIgnoreCase))
                 {
                     // only move 3D refs that refer to the sheet with cells
                     // being moved
@@ -426,7 +426,7 @@ private Ptg AdjustPtgDueToColumnMove(Ptg ptg, int currentExternSheetIx)
             if (ptg is Area3DPxg apxg)
             {
                 if (apxg.ExternalWorkbookNumber > 0 ||
-                        !_sheetName.Equals(apxg.SheetName))
+                        !_sheetName.Equals(apxg.SheetName, StringComparison.OrdinalIgnoreCase))
                 {
                     // only move 3D refs that refer to the sheet with cells
                     // being moved

main/SS/Formula/FormulaUsedBlankCellSet.cs

@@ -62,15 +62,19 @@ private  class BlankCellSheetGroup
             private int _firstColumnIndex;
             private int _lastColumnIndex;
             private BlankCellRectangleGroup _currentRectangleGroup;
+            private int _lastDefinedRow;
 
-            public BlankCellSheetGroup()
+            public BlankCellSheetGroup(int lastDefinedRow)
             {
                 _rectangleGroups = [];
                 _currentRowIndex = -1;
+                _lastDefinedRow = lastDefinedRow;
             }
 
             public void AddCell(int rowIndex, int columnIndex)
             {
+                if(rowIndex > _lastDefinedRow)
+                    return;
                 if (_currentRowIndex == -1)
                 {
                     _currentRowIndex = rowIndex;
@@ -107,6 +111,8 @@ public void AddCell(int rowIndex, int columnIndex)
 
             public bool ContainsCell(int rowIndex, int columnIndex)
             {
+                if(rowIndex > _lastDefinedRow)
+                    return true;
                 for (int i = _rectangleGroups.Count - 1; i >= 0; i--)
                 {
                     BlankCellRectangleGroup bcrg = (BlankCellRectangleGroup)_rectangleGroups[i];
@@ -203,20 +209,20 @@ public FormulaUsedBlankCellSet()
             _sheetGroupsByBookSheet = new Hashtable();
         }
 
-        public void AddCell(int bookIndex, int sheetIndex, int rowIndex, int columnIndex)
+        public void AddCell(IEvaluationWorkbook evalWorkbook, int bookIndex, int sheetIndex, int rowIndex, int columnIndex)
         {
-            BlankCellSheetGroup sbcg = GetSheetGroup(bookIndex, sheetIndex);
+            BlankCellSheetGroup sbcg = GetSheetGroup(evalWorkbook, bookIndex, sheetIndex);
             sbcg.AddCell(rowIndex, columnIndex);
         }
 
-        private BlankCellSheetGroup GetSheetGroup(int bookIndex, int sheetIndex)
+        private BlankCellSheetGroup GetSheetGroup(IEvaluationWorkbook evalWorkbook, int bookIndex, int sheetIndex)
         {
             BookSheetKey key = new BookSheetKey(bookIndex, sheetIndex);
 
             BlankCellSheetGroup result = (BlankCellSheetGroup)_sheetGroupsByBookSheet[key];
             if (result == null)
             {
-                result = new BlankCellSheetGroup();
+                result = new BlankCellSheetGroup(evalWorkbook.GetSheet(sheetIndex).LastRowNum);
                 _sheetGroupsByBookSheet[key]= result;
             }
             return result;

main/SS/Formula/WorkbookEvaluator.cs

@@ -407,7 +407,7 @@ private ValueEval EvaluateAny(IEvaluationCell srcCell, int sheetIndex,
                 result = GetValueFromNonFormulaCell(srcCell);
                 if (shouldCellDependencyBeRecorded)
                 {
-                    tracker.AcceptPlainValueDependency(_workbookIx, sheetIndex, rowIndex, columnIndex, result);
+                    tracker.AcceptPlainValueDependency(_workbook, _workbookIx, sheetIndex, rowIndex, columnIndex, result);
                 }
                 return result;
             }