Changeset 12707 for stable/HeuristicLab.ExtLibs/HeuristicLab.EPPlus/4.0.3/EPPlus-4.0.3/ExcelCellBase.cs

Timestamp:

07/10/15 12:07:08 (9 years ago)

Author:

mkommend

Message:

#2341: Merged all EPPlus changes into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.ExtLibs (modified) (1 prop)
• HeuristicLab.ExtLibs/HeuristicLab.EPPlus/4.0.3 (copied) (copied from trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.EPPlus/4.0.3)
• HeuristicLab.ExtLibs/HeuristicLab.EPPlus/4.0.3/EPPlus-4.0.3 (modified) (1 prop)
• HeuristicLab.ExtLibs/HeuristicLab.EPPlus/4.0.3/EPPlus-4.0.3/ExcelCellBase.cs (modified) (3 diffs)

stable/HeuristicLab.ExtLibs/HeuristicLab.EPPlus/4.0.3/EPPlus-4.0.3/ExcelCellBase.cs

@@ -481 +481 @@
             return GetRowCol(address, out row, out col, throwException, out fixedRow, out fixedCol);
         }
-        internal static bool GetRowCol(string address, out int row, out int col, bool throwException, out bool fixedRow, out bool fixedCol)
-        {
+        internal static bool GetRowCol(string address, out int row, out int col, bool throwException, out bool fixedRow, out bool fixedCol) {
             bool colPart = true;
-            string sRow = "", sCol = "";
+            int colStartIx = 0;
+            int colLength = 0;
             col = 0;
+            row = 0;
             fixedRow = false;
             fixedCol = false;
-            if (address.IndexOf(':') > 0)  //If it is a mult-cell address use 
-            {
-                address = address.Substring(0, address.IndexOf(':'));
-            }
+
             if (address.EndsWith("#REF!"))
             {
@@ -502 +500 @@
             if (sheetMarkerIndex >= 0)
             {
-                address = address.Substring(sheetMarkerIndex + 1);
-            }
-
-            address = address.ToUpper(CultureInfo.InvariantCulture);
-            for (int i = 0; i < address.Length; i++)
-            {
-                if ((address[i] >= 'A' && address[i] <= 'Z') && colPart && sCol.Length <= 3)
-                {
-                    sCol += address[i];
-                }
-                else if (address[i] >= '0' && address[i] <= '9')
-                {
-                    sRow += address[i];
+                colStartIx = sheetMarkerIndex + 1;
+            }
+
+            for (int i = colStartIx; i < address.Length; i++)
+            {
+                char c = address[i];
+                if (colPart && ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z')) && colLength <= 3)
+                {
+                    col *= 26;
+                    col += ((int)c) - 64;
+                    colLength++;
+                }
+                else if (c >= '0' && c <= '9')
+                {
+                    row *= 10;
+                    row += ((int)c) - 48;
                     colPart = false;
                 }
-                else if (address[i] == '$')
-                {
-                    if (i == 0) 
-                        fixedCol = true; 
-                    else 
+                else if (c == '$')
+                {
+                    if (i == colStartIx)
+                    {
+                        colStartIx++;
+                        fixedCol = true;
+                    }
+                    else
+                    {
+                        colPart = false;
                         fixedRow = true;
-                }
-                else
-                {
+                    }
+                }
+                else if (c == ':')
+                {
+                    break;
+                }
+                else
+                {
+                    row = 0;
+                    col = 0;
                     if (throwException)
                     {
@@ -532 +545 @@
                     else
                     {
-                        row = 0;
-                        col = 0;
                         return false;
                     }
                 }
             }
-
-            // Get the column number
-            if (sCol != "")
-            {
-                col = GetColumn(sCol);
-            }
-            else
-            {
-                col = 0;
-                int.TryParse(sRow, out row);
-                return row>0;
-            }
-            // Get the row number
-            if (sRow == "") //Blank, fullRow
-            {
-                //if (throwException)
-                //{
-                //    throw (new Exception(string.Format("Invalid Address format {0}", address)));
-                //}
-                //else
-                //{                    
-                row = 0;
-                return col > 0;
-                //}
-            }
-            else
-            {
-                return int.TryParse(sRow, out row);
-            }
+            return row != 0 || col != 0;
         }