Fix wrong calculation of highest column

issue #700
PHPOffice · Jan 20, 2019 · ef39af1 · ef39af1
1 parent bf00f0c
commit ef39af1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/PhpSpreadsheet/Collection/Cells.php b/src/PhpSpreadsheet/Collection/Cells.php
@@ -259,7 +259,7 @@ public function getHighestColumn($row = null)
             $columnList[] = Coordinate::columnIndexFromString($c);
         }
 
-        return Coordinate::stringFromColumnIndex(max($columnList) + 1);
+        return Coordinate::stringFromColumnIndex(max($columnList));
     }
 
     /**

diff --git a/src/PhpSpreadsheet/Reader/Xlsx.php b/src/PhpSpreadsheet/Reader/Xlsx.php
@@ -2525,6 +2525,10 @@ private function readColumnsAndRowsAttributes(SimpleXMLElement $xmlSheet, Worksh
         if (isset($xmlSheet->cols) && !$this->readDataOnly) {
             foreach ($xmlSheet->cols->col as $col) {
                 for ($i = (int) ($col['min']); $i <= (int) ($col['max']); ++$i) {
+                    if ((int) ($col['max']) == 16384) {
+                        break;
+                    }
+
                     if ($col['style'] && !$this->readDataOnly) {
                         $columnsAttributes[Coordinate::stringFromColumnIndex($i)]['xfIndex'] = (int) $col['style'];
                     }
@@ -2538,10 +2542,6 @@ private function readColumnsAndRowsAttributes(SimpleXMLElement $xmlSheet, Worksh
                         $columnsAttributes[Coordinate::stringFromColumnIndex($i)]['outlineLevel'] = (int) $col['outlineLevel'];
                     }
                     $columnsAttributes[Coordinate::stringFromColumnIndex($i)]['width'] = (float) $col['width'];
-
-                    if ((int) ($col['max']) == 16384) {
-                        break;
-                    }
                 }
             }
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -259,7 +259,7 @@ public function getHighestColumn($row = null) @@
                 $columnList[] = Coordinate::columnIndexFromString($c);
             }
-            return Coordinate::stringFromColumnIndex(max($columnList) + 1);
+            return Coordinate::stringFromColumnIndex(max($columnList));
         }
         /**
@@ Expand Down @@