Patches ported from poi 3.16

OpenXmlFormats/Spreadsheet/Sheet/CT_Worksheet.cs

@@ -410,6 +410,11 @@ public bool IsSetSheetCalcPr()
         {
             return this.sheetCalcPrField != null;
         }
+
+        public bool IsSetDimension()
+        {
+            return this.dimensionField != null;
+        }
         public CT_SheetProtection AddNewSheetProtection()
         {
             this.sheetProtectionField = new CT_SheetProtection();

main/HPSF/HPSFPropertiesOnlyDocument.cs

@@ -98,7 +98,9 @@ private void Write(NPOIFSFileSystem fs)
             WriteProperties(fs, excepts);
 
             // Copy over everything else unchanged
-            EntryUtils.CopyNodes(directory, fs.Root, excepts);
+            FilteringDirectoryNode src = new FilteringDirectoryNode(directory, excepts);
+            FilteringDirectoryNode dest = new FilteringDirectoryNode(fs.Root, excepts);
+            EntryUtils.CopyNodes(src, dest);
 
             // Caller will save the resultant POIFSFileSystem to the stream/file
         }

main/HSSF/UserModel/HSSFCell.cs

@@ -1456,6 +1456,7 @@ internal void NotifyArrayFormulaChanging()
             NotifyArrayFormulaChanging(msg);
         }
 
+        [Obsolete("Will be removed at NPOI 2.8, Use CachedFormulaResultType instead.")]
         public CellType GetCachedFormulaResultTypeEnum()
         {
             throw new NotImplementedException();

main/POIFS/FileSystem/EntryUtils.cs

@@ -83,31 +83,6 @@ public static void CopyNodes(FilteringDirectoryNode filteredSource,
             CopyNodes((DirectoryEntry)filteredSource, (DirectoryEntry)filteredTarget);
         }
 
-        /**
-         * Copies nodes from one Directory to the other minus the excepts
-         * 
-         * @param sourceRoot
-         *            is the source Directory to copy from
-         * @param targetRoot
-         *            is the target Directory to copy to
-         * @param excepts
-         *            is a list of Strings specifying what nodes NOT to copy
-         * @deprecated use {@link FilteringDirectoryNode} instead
-         */
-        [Obsolete]
-        public static void CopyNodes(DirectoryEntry sourceRoot,
-                DirectoryEntry targetRoot, List<String> excepts)
-        {
-            IEnumerator entries = sourceRoot.Entries;
-            while (entries.MoveNext())
-            {
-                Entry entry = (Entry)entries.Current;
-                if (!excepts.Contains(entry.Name))
-                {
-                    CopyNodeRecursively(entry, targetRoot);
-                }
-            }
-        }
 
         /**
          * Copies all nodes from one POIFS to the other

main/SS/Formula/FormulaShifter.cs

@@ -111,23 +111,6 @@ private FormulaShifter(int srcSheetIndex, int dstSheetIndex)
             _mode = ShiftMode.SheetMove;
         }
 
-        [Obsolete("deprecated As of 3.14 beta 1 (November 2015), replaced by CreateForRowShift(int, String, int, int, int, SpreadsheetVersion)")]
-        public static FormulaShifter CreateForRowShift(
-            int externSheetIndex,
-            string sheetName,
-            int firstMovedRowIndex,
-            int lastMovedRowIndex,
-            int numberOfRowsToMove)
-        {
-            return CreateForRowShift(
-                externSheetIndex,
-                sheetName,
-                firstMovedRowIndex,
-                lastMovedRowIndex,
-                numberOfRowsToMove,
-                SpreadsheetVersion.EXCEL97);
-        }
-
         public static FormulaShifter CreateForRowShift(
             int externSheetIndex,
             string sheetName,

main/SS/UserModel/Cell.cs

@@ -283,7 +283,19 @@ CellType CellType
         bool IsPartOfArrayFormulaGroup { get; }
 
         bool IsMergedCell { get; }
-
+
+        /// <summary>
+        /// Only valid for formula cells
+        /// </summary>
+        /// <returns>one of (<see cref="CellType.Numeric" />, <see cref="CellType.String" />,
+        /// <see cref="CellType.Boolean" />, <see cref="CellType.Error" />) depending
+        /// on the cached value of the formula
+        /// </returns>
+        /// <remarks>
+        /// @since POI 3.15 beta 3
+        /// Will be renamed to <c>getCachedFormulaResultType()</c> when we make the CellType enum transition in POI 4.0. See bug 59791.
+        /// </remarks>
+        [Obsolete("Will be removed at NPOI 2.8, Use CachedFormulaResultType instead.")]
         CellType GetCachedFormulaResultTypeEnum();
     }
 }

main/SS/UserModel/DataFormatter.cs

@@ -1044,7 +1044,7 @@ public string FormatCellValue(ICell cell, IFormulaEvaluator evaluator)
                     {
                         try
                         {
-                            cellType = cell.GetCachedFormulaResultTypeEnum();
+                            cellType = cell.CachedFormulaResultType;
                         }
                         catch(Exception)
                         {

ooxml/XSSF/Extractor/XSSFExportToXml.cs

@@ -285,7 +285,7 @@ private void mapCellOnNode(XSSFCell cell, XmlNode node)
                 case CellType.Boolean: value += cell.BooleanCellValue; break;
                 case CellType.Error: value = cell.ErrorCellString; break;
                 case CellType.Formula:
-                    if(cell.GetCachedFormulaResultTypeEnum()== CellType.String)
+                    if(cell.CachedFormulaResultType== CellType.String)
                     {
                         value = cell.StringCellValue;
                     }
@@ -295,7 +295,7 @@ private void mapCellOnNode(XSSFCell cell, XmlNode node)
                         {
                             value = GetFormattedDate(cell);
                         }
-                        else if(cell.GetCachedFormulaResultTypeEnum()== CellType.Numeric)
+                        else if(cell.CachedFormulaResultType== CellType.Numeric)
                         {
                             value=cell.GetRawValue();
                         }
@@ -455,12 +455,12 @@ public int Compare(String leftXpath, String rightXpath)
             String[] leftTokens = leftXpath.Split(new char[]{'/'});
             String[] rightTokens = rightXpath.Split(new char[] { '/' });
 
-            int minLenght = leftTokens.Length < rightTokens.Length ? leftTokens.Length : rightTokens.Length;
+            int minLength = leftTokens.Length < rightTokens.Length ? leftTokens.Length : rightTokens.Length;
 
             XmlNode localComplexTypeRootNode = doc.DocumentElement;
 
 
-            for (int i = 1; i < minLenght; i++)
+            for (int i = 1; i < minLength; i++)
             {
 
                 String leftElementName = leftTokens[i];
@@ -496,7 +496,10 @@ public int Compare(String leftXpath, String rightXpath)
 
         private int IndexOfElementInComplexType(String elementName, XmlNode complexType)
         {
-
+            if(complexType == null)
+            {
+                return -1;
+            }
             XmlNodeList list = complexType.ChildNodes;
             int indexOf = -1;
 
@@ -507,8 +510,8 @@ private int IndexOfElementInComplexType(String elementName, XmlNode complexType)
                 {
                     if (node.LocalName.Equals("element"))
                     {
-                        XmlNode nameAttribute = node.Attributes.GetNamedItem("name");
-                        if (nameAttribute.Value.Equals(RemoveNamespace(elementName)))
+                        XmlNode element = GetNameOrRefElement(node);
+                        if (element.Value.Equals(RemoveNamespace(elementName)))
                         {
                             indexOf = i;
                             break;
@@ -519,22 +522,32 @@ private int IndexOfElementInComplexType(String elementName, XmlNode complexType)
             }
             return indexOf;
         }
+        private XmlNode GetNameOrRefElement(XmlNode node)
+        {
+            XmlNode returnNode = node.Attributes.GetNamedItem("name");
+            if(returnNode != null)
+            {
+                return returnNode;
+            }
+
+            return node.Attributes.GetNamedItem("ref");
+        }
 
         private XmlNode GetComplexTypeForElement(String elementName, XmlNode xmlSchema, XmlNode localComplexTypeRootNode)
         {
             String elementNameWithoutNamespace = RemoveNamespace(elementName);
 
-            String complexTypeName = getComplexTypeNameFromChildren(localComplexTypeRootNode, elementNameWithoutNamespace);
+            String complexTypeName = GetComplexTypeNameFromChildren(localComplexTypeRootNode, elementNameWithoutNamespace);
 
             XmlNode complexTypeNode = null;
             // Note: we expect that all the complex types are defined at root level
             if(!"".Equals(complexTypeName))
             {
-                complexTypeNode = getComplexTypeNodeFromSchemaChildren(xmlSchema, null, complexTypeName);
+                complexTypeNode = GetComplexTypeNodeFromSchemaChildren(xmlSchema, null, complexTypeName);
             }
             return complexTypeNode;
         }
-        private String getComplexTypeNameFromChildren(XmlNode localComplexTypeRootNode,
+        private String GetComplexTypeNameFromChildren(XmlNode localComplexTypeRootNode,
             String elementNameWithoutNamespace)
         {
             if(localComplexTypeRootNode == null)
@@ -566,45 +579,45 @@ private String getComplexTypeNameFromChildren(XmlNode localComplexTypeRootNode,
             }
             return complexTypeName;
         }
-        private XmlNode getComplexTypeNodeFromSchemaChildren(XmlNode xmlSchema, XmlNode complexTypeNode,
+        private XmlNode GetComplexTypeNodeFromSchemaChildren(XmlNode xmlSchema, XmlNode complexTypeNode,
            String complexTypeName)
         {
 
-                XmlNodeList complexTypeList = xmlSchema.ChildNodes;
-                for(int i = 0; i < complexTypeList.Count; i++)
+            XmlNodeList complexTypeList = xmlSchema.ChildNodes;
+            for(int i = 0; i < complexTypeList.Count; i++)
+            {
+                XmlNode node = complexTypeList[i];
+                if(node is XmlElement)
                 {
-                    XmlNode node = complexTypeList[i];
-                    if(node is XmlElement)
+                    if(node.LocalName.Equals("complexType"))
                     {
-                        if(node.LocalName.Equals("complexType"))
+                        XmlNode nameAttribute = node.Attributes.GetNamedItem("name");
+                        if(nameAttribute.Value.Equals(complexTypeName))
                         {
-                            XmlNode nameAttribute = node.Attributes.GetNamedItem("name");
-                            if(nameAttribute.Value.Equals(complexTypeName))
+
+                            XmlNodeList complexTypeChildList = node.ChildNodes;
+                            for(int j = 0; j < complexTypeChildList.Count; j++)
                             {
+                                XmlNode sequence = complexTypeChildList[j];
 
-                                XmlNodeList complexTypeChildList = node.ChildNodes;
-                                for(int j = 0; j < complexTypeChildList.Count; j++)
+                                if(sequence is XmlElement)
                                 {
-                                    XmlNode sequence = complexTypeChildList[j];
-
-                                    if(sequence is XmlElement)
+                                    if(sequence.LocalName.Equals("sequence"))
                                     {
-                                        if(sequence.LocalName.Equals("sequence"))
-                                        {
-                                            complexTypeNode = sequence;
-                                            break;
-                                        }
+                                        complexTypeNode = sequence;
+                                        break;
                                     }
                                 }
-                                if(complexTypeNode != null)
-                                {
-                                    break;
-                                }
-
                             }
+                            if(complexTypeNode != null)
+                            {
+                                break;
+                            }
+
                         }
                     }
                 }
+            }
             return complexTypeNode;
         }
     }

ooxml/XSSF/Streaming/SXSSFCell.cs

@@ -85,17 +85,21 @@ public bool BooleanCellValue
 
         public CellType CachedFormulaResultType
         {
-            get { return GetCachedFormulaResultTypeEnum(); }
+            get
+            {
+                if(_value.GetType() != CellType.Formula)
+                {
+                    throw new InvalidOperationException("Only formula cells have cached results");
+                }
+
+                return ((FormulaValue) _value).GetFormulaType();
+            }
         }
 
+        [Obsolete("Will be removed at NPOI 2.8, Use CachedFormulaResultType instead.")]
         public CellType GetCachedFormulaResultTypeEnum()
         {
-            if (_value.GetType() != CellType.Formula)
-            {
-                throw new InvalidOperationException("Only formula cells have cached results");
-            }
-
-            return ((FormulaValue)_value).GetFormulaType();
+            return CachedFormulaResultType;
         }
 
         public IComment CellComment
@@ -755,7 +759,7 @@ private void SetType(CellType type)
                         if (_value != null)
                         {
                             // if a cell is not blank then convert the old value to string
-                            bool val = convertCellValueToBoolean();
+                            bool val = ConvertCellValueToBoolean();
                             bval.Value = val;
                         }
                         _value = bval;
@@ -824,13 +828,13 @@ private static InvalidOperationException typeMismatch(CellType expectedTypeCode,
                     + " " + (isFormulaCell ? "formula " : "") + "cell";
             return new InvalidOperationException(msg);
         }
-        private bool convertCellValueToBoolean()
+        private bool ConvertCellValueToBoolean()
         {
             CellType cellType = _value.GetType();
 
             if (cellType == CellType.Formula)
             {
-                cellType = GetCachedFormulaResultTypeEnum();
+                cellType = CachedFormulaResultType;
             }
 
             switch (cellType)

ooxml/XSSF/Streaming/SXSSFEvaluationCell.cs

@@ -163,13 +163,8 @@ public CellType CachedFormulaResultType
                 return _cell.CachedFormulaResultType;
             }
         }
-        /**
-         * @since POI 3.15 beta 3
-         * @deprecated POI 3.15 beta 3.
-         * Will be deleted when we make the CellType enum transition. See bug 59791.
-         */
-        //@Internal(since= "POI 3.15 beta 3")
 
+        [Obsolete("Will be removed at NPOI 2.8, Use CachedFormulaResultType instead.")]
         public CellType GetCachedFormulaResultTypeEnum()
         {
             return _cell.GetCachedFormulaResultTypeEnum();

ooxml/XSSF/Streaming/SheetDataWriter.cs

@@ -309,7 +309,7 @@ public void WriteCell(int columnIndex, ICell cell)
 
                         WriteAsBytes("</f>");
 
-                        switch (cell.GetCachedFormulaResultTypeEnum())
+                        switch (cell.CachedFormulaResultType)
                         {
                             case CellType.Numeric:
                                 double nval = cell.NumericCellValue;

ooxml/XSSF/UserModel/XSSFCell.cs

@@ -1385,6 +1385,7 @@ public ICell CopyCellTo(int targetIndex)
             return CellUtil.CopyCell(this.Row, this.ColumnIndex, targetIndex);
         }
 
+        [Obsolete("Will be removed at NPOI 2.8, Use CachedFormulaResultType instead.")]
         public CellType GetCachedFormulaResultTypeEnum()
         {
             if(!IsFormulaCell)
@@ -1395,6 +1396,4 @@ public CellType GetCachedFormulaResultTypeEnum()
             return GetBaseCellType(false);
         }
     }
-
-
 }

ooxml/XSSF/UserModel/XSSFRichTextString.cs

@@ -69,7 +69,7 @@ namespace NPOI.XSSF.UserModel
      */
     public class XSSFRichTextString : IRichTextString
     {
-        private static Regex utfPtrn = new Regex("_x([0-9A-F]{4})_", RegexOptions.Compiled);
+        private static Regex utfPtrn = new Regex("_x([0-9A-Fa-f]{4})_", RegexOptions.Compiled);
 
         private CT_Rst st;
         private StylesTable styles;