@@ -1020,8 +1020,8 @@ discard block |
||
1020 | 1020 | |
1021 | 1021 | // Write the packed data |
1022 | 1022 | $this->append($header . $data . |
1023 | - $unknown1 . $options . |
|
1024 | - $unknown2 . $url_len . $url); |
|
1023 | + $unknown1 . $options . |
|
1024 | + $unknown2 . $url_len . $url); |
|
1025 | 1025 | |
1026 | 1026 | return 0; |
1027 | 1027 | } |
@@ -1069,8 +1069,8 @@ discard block |
||
1069 | 1069 | |
1070 | 1070 | // Write the packed data |
1071 | 1071 | $this->append($header . $data . |
1072 | - $unknown1 . $options . |
|
1073 | - $url_len . $url); |
|
1072 | + $unknown1 . $options . |
|
1073 | + $url_len . $url); |
|
1074 | 1074 | |
1075 | 1075 | return 0; |
1076 | 1076 | } |
@@ -1151,14 +1151,14 @@ discard block |
||
1151 | 1151 | |
1152 | 1152 | // Pack the main data stream |
1153 | 1153 | $data = pack('vvvv', $row1, $row2, $col1, $col2) . |
1154 | - $unknown1 . |
|
1155 | - $link_type . |
|
1156 | - $unknown2 . |
|
1157 | - $up_count . |
|
1158 | - $dir_short_len . |
|
1159 | - $dir_short . |
|
1160 | - $unknown3 . |
|
1161 | - $stream_len;/*. |
|
1154 | + $unknown1 . |
|
1155 | + $link_type . |
|
1156 | + $unknown2 . |
|
1157 | + $up_count . |
|
1158 | + $dir_short_len . |
|
1159 | + $dir_short . |
|
1160 | + $unknown3 . |
|
1161 | + $stream_len;/*. |
|
1162 | 1162 | $dir_long_len . |
1163 | 1163 | $unknown4 . |
1164 | 1164 | $dir_long . |
@@ -666,7 +666,7 @@ |
||
666 | 666 | list($row1, $col1) = $this->cellToPackedRowcol($cell1); |
667 | 667 | list($row2, $col2) = $this->cellToPackedRowcol($cell2); |
668 | 668 | } else { // It's a rows range (like 26:27) |
669 | - list($row1, $col1, $row2, $col2) = $this->rangeToPackedRange($cell1 . ':' . $cell2); |
|
669 | + list($row1, $col1, $row2, $col2) = $this->rangeToPackedRange($cell1 . ':' . $cell2); |
|
670 | 670 | } |
671 | 671 | |
672 | 672 | // The ptg value depends on the class of the ptg. |
@@ -138,8 +138,8 @@ |
||
138 | 138 | } |
139 | 139 | |
140 | 140 | $hashTablesArray = ['stylesConditionalHashTable', 'fillHashTable', 'fontHashTable', |
141 | - 'bordersHashTable', 'numFmtHashTable', 'drawingHashTable', |
|
142 | - 'styleHashTable', |
|
141 | + 'bordersHashTable', 'numFmtHashTable', 'drawingHashTable', |
|
142 | + 'styleHashTable', |
|
143 | 143 | ]; |
144 | 144 | |
145 | 145 | // Set HashTable variables |
@@ -46,11 +46,11 @@ discard block |
||
46 | 46 | // XML header |
47 | 47 | $objWriter->startDocument('1.0', 'UTF-8', 'yes'); |
48 | 48 | |
49 | - // Comments cache |
|
50 | - $comments = $pWorksheet->getComments(); |
|
49 | + // Comments cache |
|
50 | + $comments = $pWorksheet->getComments(); |
|
51 | 51 | |
52 | - // Authors cache |
|
53 | - $authors = []; |
|
52 | + // Authors cache |
|
53 | + $authors = []; |
|
54 | 54 | $authorId = 0; |
55 | 55 | foreach ($comments as $comment) { |
56 | 56 | if (!isset($authors[$comment->getAuthor()])) { |
@@ -126,8 +126,8 @@ discard block |
||
126 | 126 | // XML header |
127 | 127 | $objWriter->startDocument('1.0', 'UTF-8', 'yes'); |
128 | 128 | |
129 | - // Comments cache |
|
130 | - $comments = $pWorksheet->getComments(); |
|
129 | + // Comments cache |
|
130 | + $comments = $pWorksheet->getComments(); |
|
131 | 131 | |
132 | 132 | // xml |
133 | 133 | $objWriter->startElement('xml'); |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | private function writeVMLComment(\PhpSpreadsheet\Shared\XMLWriter $objWriter = null, $pCellReference = 'A1', \PhpSpreadsheet\Comment $pComment = null) |
190 | 190 | { |
191 | 191 | // Metadata |
192 | - list($column, $row) = \PhpSpreadsheet\Cell::coordinateFromString($pCellReference); |
|
192 | + list($column, $row) = \PhpSpreadsheet\Cell::coordinateFromString($pCellReference); |
|
193 | 193 | $column = \PhpSpreadsheet\Cell::columnIndexFromString($column); |
194 | 194 | $id = 1024 + $column + $row; |
195 | 195 | $id = substr($id, 0, 4); |
@@ -565,49 +565,49 @@ discard block |
||
565 | 565 | |
566 | 566 | // GKPIDDSI_CODEPAGE: CodePage |
567 | 567 | $dataSection[] = ['summary' => ['pack' => 'V', 'data' => 0x01], |
568 | - 'offset' => ['pack' => 'V'], |
|
569 | - 'type' => ['pack' => 'V', 'data' => 0x02], // 2 byte signed integer |
|
570 | - 'data' => ['data' => 1252], ]; |
|
568 | + 'offset' => ['pack' => 'V'], |
|
569 | + 'type' => ['pack' => 'V', 'data' => 0x02], // 2 byte signed integer |
|
570 | + 'data' => ['data' => 1252], ]; |
|
571 | 571 | ++$dataSection_NumProps; |
572 | 572 | |
573 | 573 | // GKPIDDSI_CATEGORY : Category |
574 | 574 | if ($this->spreadsheet->getProperties()->getCategory()) { |
575 | 575 | $dataProp = $this->spreadsheet->getProperties()->getCategory(); |
576 | 576 | $dataSection[] = ['summary' => ['pack' => 'V', 'data' => 0x02], |
577 | - 'offset' => ['pack' => 'V'], |
|
578 | - 'type' => ['pack' => 'V', 'data' => 0x1E], |
|
579 | - 'data' => ['data' => $dataProp, 'length' => strlen($dataProp)], ]; |
|
577 | + 'offset' => ['pack' => 'V'], |
|
578 | + 'type' => ['pack' => 'V', 'data' => 0x1E], |
|
579 | + 'data' => ['data' => $dataProp, 'length' => strlen($dataProp)], ]; |
|
580 | 580 | ++$dataSection_NumProps; |
581 | 581 | } |
582 | 582 | // GKPIDDSI_VERSION :Version of the application that wrote the property storage |
583 | 583 | $dataSection[] = ['summary' => ['pack' => 'V', 'data' => 0x17], |
584 | - 'offset' => ['pack' => 'V'], |
|
585 | - 'type' => ['pack' => 'V', 'data' => 0x03], |
|
586 | - 'data' => ['pack' => 'V', 'data' => 0x000C0000], ]; |
|
584 | + 'offset' => ['pack' => 'V'], |
|
585 | + 'type' => ['pack' => 'V', 'data' => 0x03], |
|
586 | + 'data' => ['pack' => 'V', 'data' => 0x000C0000], ]; |
|
587 | 587 | ++$dataSection_NumProps; |
588 | 588 | // GKPIDDSI_SCALE : FALSE |
589 | 589 | $dataSection[] = ['summary' => ['pack' => 'V', 'data' => 0x0B], |
590 | - 'offset' => ['pack' => 'V'], |
|
591 | - 'type' => ['pack' => 'V', 'data' => 0x0B], |
|
592 | - 'data' => ['data' => false], ]; |
|
590 | + 'offset' => ['pack' => 'V'], |
|
591 | + 'type' => ['pack' => 'V', 'data' => 0x0B], |
|
592 | + 'data' => ['data' => false], ]; |
|
593 | 593 | ++$dataSection_NumProps; |
594 | 594 | // GKPIDDSI_LINKSDIRTY : True if any of the values for the linked properties have changed outside of the application |
595 | 595 | $dataSection[] = ['summary' => ['pack' => 'V', 'data' => 0x10], |
596 | - 'offset' => ['pack' => 'V'], |
|
597 | - 'type' => ['pack' => 'V', 'data' => 0x0B], |
|
598 | - 'data' => ['data' => false], ]; |
|
596 | + 'offset' => ['pack' => 'V'], |
|
597 | + 'type' => ['pack' => 'V', 'data' => 0x0B], |
|
598 | + 'data' => ['data' => false], ]; |
|
599 | 599 | ++$dataSection_NumProps; |
600 | 600 | // GKPIDDSI_SHAREDOC : FALSE |
601 | 601 | $dataSection[] = ['summary' => ['pack' => 'V', 'data' => 0x13], |
602 | - 'offset' => ['pack' => 'V'], |
|
603 | - 'type' => ['pack' => 'V', 'data' => 0x0B], |
|
604 | - 'data' => ['data' => false], ]; |
|
602 | + 'offset' => ['pack' => 'V'], |
|
603 | + 'type' => ['pack' => 'V', 'data' => 0x0B], |
|
604 | + 'data' => ['data' => false], ]; |
|
605 | 605 | ++$dataSection_NumProps; |
606 | 606 | // GKPIDDSI_HYPERLINKSCHANGED : True if any of the values for the _PID_LINKS (hyperlink text) have changed outside of the application |
607 | 607 | $dataSection[] = ['summary' => ['pack' => 'V', 'data' => 0x16], |
608 | - 'offset' => ['pack' => 'V'], |
|
609 | - 'type' => ['pack' => 'V', 'data' => 0x0B], |
|
610 | - 'data' => ['data' => false], ]; |
|
608 | + 'offset' => ['pack' => 'V'], |
|
609 | + 'type' => ['pack' => 'V', 'data' => 0x0B], |
|
610 | + 'data' => ['data' => false], ]; |
|
611 | 611 | ++$dataSection_NumProps; |
612 | 612 | |
613 | 613 | // GKPIDDSI_DOCSPARTS |
@@ -617,50 +617,50 @@ discard block |
||
617 | 617 | $dataProp = pack('v', 0x0001); |
618 | 618 | $dataProp .= pack('v', 0x0000); |
619 | 619 | // array of UnalignedLpstr |
620 | - // cch |
|
621 | - $dataProp .= pack('v', 0x000A); |
|
620 | + // cch |
|
621 | + $dataProp .= pack('v', 0x000A); |
|
622 | 622 | $dataProp .= pack('v', 0x0000); |
623 | - // value |
|
624 | - $dataProp .= 'Worksheet' . chr(0); |
|
623 | + // value |
|
624 | + $dataProp .= 'Worksheet' . chr(0); |
|
625 | 625 | |
626 | 626 | $dataSection[] = ['summary' => ['pack' => 'V', 'data' => 0x0D], |
627 | - 'offset' => ['pack' => 'V'], |
|
628 | - 'type' => ['pack' => 'V', 'data' => 0x101E], |
|
629 | - 'data' => ['data' => $dataProp, 'length' => strlen($dataProp)], ]; |
|
627 | + 'offset' => ['pack' => 'V'], |
|
628 | + 'type' => ['pack' => 'V', 'data' => 0x101E], |
|
629 | + 'data' => ['data' => $dataProp, 'length' => strlen($dataProp)], ]; |
|
630 | 630 | ++$dataSection_NumProps; |
631 | 631 | |
632 | 632 | // GKPIDDSI_HEADINGPAIR |
633 | 633 | // VtVecHeadingPairValue |
634 | - // cElements |
|
635 | - $dataProp = pack('v', 0x0002); |
|
634 | + // cElements |
|
635 | + $dataProp = pack('v', 0x0002); |
|
636 | 636 | $dataProp .= pack('v', 0x0000); |
637 | - // Array of vtHeadingPair |
|
637 | + // Array of vtHeadingPair |
|
638 | 638 | // vtUnalignedString - headingString |
639 | - // stringType |
|
640 | - $dataProp .= pack('v', 0x001E); |
|
641 | - // padding |
|
642 | - $dataProp .= pack('v', 0x0000); |
|
643 | - // UnalignedLpstr |
|
639 | + // stringType |
|
640 | + $dataProp .= pack('v', 0x001E); |
|
641 | + // padding |
|
642 | + $dataProp .= pack('v', 0x0000); |
|
643 | + // UnalignedLpstr |
|
644 | 644 | // cch |
645 | 645 | $dataProp .= pack('v', 0x0013); |
646 | 646 | $dataProp .= pack('v', 0x0000); |
647 | 647 | // value |
648 | 648 | $dataProp .= 'Feuilles de calcul'; |
649 | 649 | // vtUnalignedString - headingParts |
650 | - // wType : 0x0003 = 32 bit signed integer |
|
651 | - $dataProp .= pack('v', 0x0300); |
|
652 | - // padding |
|
653 | - $dataProp .= pack('v', 0x0000); |
|
654 | - // value |
|
655 | - $dataProp .= pack('v', 0x0100); |
|
650 | + // wType : 0x0003 = 32 bit signed integer |
|
651 | + $dataProp .= pack('v', 0x0300); |
|
652 | + // padding |
|
653 | + $dataProp .= pack('v', 0x0000); |
|
654 | + // value |
|
655 | + $dataProp .= pack('v', 0x0100); |
|
656 | 656 | $dataProp .= pack('v', 0x0000); |
657 | 657 | $dataProp .= pack('v', 0x0000); |
658 | 658 | $dataProp .= pack('v', 0x0000); |
659 | 659 | |
660 | 660 | $dataSection[] = ['summary' => ['pack' => 'V', 'data' => 0x0C], |
661 | - 'offset' => ['pack' => 'V'], |
|
662 | - 'type' => ['pack' => 'V', 'data' => 0x100C], |
|
663 | - 'data' => ['data' => $dataProp, 'length' => strlen($dataProp)], ]; |
|
661 | + 'offset' => ['pack' => 'V'], |
|
662 | + 'type' => ['pack' => 'V', 'data' => 0x100C], |
|
663 | + 'data' => ['data' => $dataProp, 'length' => strlen($dataProp)], ]; |
|
664 | 664 | ++$dataSection_NumProps; |
665 | 665 | |
666 | 666 | // 4 Section Length |
@@ -761,88 +761,88 @@ discard block |
||
761 | 761 | |
762 | 762 | // CodePage : CP-1252 |
763 | 763 | $dataSection[] = ['summary' => ['pack' => 'V', 'data' => 0x01], |
764 | - 'offset' => ['pack' => 'V'], |
|
765 | - 'type' => ['pack' => 'V', 'data' => 0x02], // 2 byte signed integer |
|
766 | - 'data' => ['data' => 1252], ]; |
|
764 | + 'offset' => ['pack' => 'V'], |
|
765 | + 'type' => ['pack' => 'V', 'data' => 0x02], // 2 byte signed integer |
|
766 | + 'data' => ['data' => 1252], ]; |
|
767 | 767 | ++$dataSection_NumProps; |
768 | 768 | |
769 | 769 | // Title |
770 | 770 | if ($this->spreadsheet->getProperties()->getTitle()) { |
771 | 771 | $dataProp = $this->spreadsheet->getProperties()->getTitle(); |
772 | 772 | $dataSection[] = ['summary' => ['pack' => 'V', 'data' => 0x02], |
773 | - 'offset' => ['pack' => 'V'], |
|
774 | - 'type' => ['pack' => 'V', 'data' => 0x1E], // null-terminated string prepended by dword string length |
|
775 | - 'data' => ['data' => $dataProp, 'length' => strlen($dataProp)], ]; |
|
773 | + 'offset' => ['pack' => 'V'], |
|
774 | + 'type' => ['pack' => 'V', 'data' => 0x1E], // null-terminated string prepended by dword string length |
|
775 | + 'data' => ['data' => $dataProp, 'length' => strlen($dataProp)], ]; |
|
776 | 776 | ++$dataSection_NumProps; |
777 | 777 | } |
778 | 778 | // Subject |
779 | 779 | if ($this->spreadsheet->getProperties()->getSubject()) { |
780 | 780 | $dataProp = $this->spreadsheet->getProperties()->getSubject(); |
781 | 781 | $dataSection[] = ['summary' => ['pack' => 'V', 'data' => 0x03], |
782 | - 'offset' => ['pack' => 'V'], |
|
783 | - 'type' => ['pack' => 'V', 'data' => 0x1E], // null-terminated string prepended by dword string length |
|
784 | - 'data' => ['data' => $dataProp, 'length' => strlen($dataProp)], ]; |
|
782 | + 'offset' => ['pack' => 'V'], |
|
783 | + 'type' => ['pack' => 'V', 'data' => 0x1E], // null-terminated string prepended by dword string length |
|
784 | + 'data' => ['data' => $dataProp, 'length' => strlen($dataProp)], ]; |
|
785 | 785 | ++$dataSection_NumProps; |
786 | 786 | } |
787 | 787 | // Author (Creator) |
788 | 788 | if ($this->spreadsheet->getProperties()->getCreator()) { |
789 | 789 | $dataProp = $this->spreadsheet->getProperties()->getCreator(); |
790 | 790 | $dataSection[] = ['summary' => ['pack' => 'V', 'data' => 0x04], |
791 | - 'offset' => ['pack' => 'V'], |
|
792 | - 'type' => ['pack' => 'V', 'data' => 0x1E], // null-terminated string prepended by dword string length |
|
793 | - 'data' => ['data' => $dataProp, 'length' => strlen($dataProp)], ]; |
|
791 | + 'offset' => ['pack' => 'V'], |
|
792 | + 'type' => ['pack' => 'V', 'data' => 0x1E], // null-terminated string prepended by dword string length |
|
793 | + 'data' => ['data' => $dataProp, 'length' => strlen($dataProp)], ]; |
|
794 | 794 | ++$dataSection_NumProps; |
795 | 795 | } |
796 | 796 | // Keywords |
797 | 797 | if ($this->spreadsheet->getProperties()->getKeywords()) { |
798 | 798 | $dataProp = $this->spreadsheet->getProperties()->getKeywords(); |
799 | 799 | $dataSection[] = ['summary' => ['pack' => 'V', 'data' => 0x05], |
800 | - 'offset' => ['pack' => 'V'], |
|
801 | - 'type' => ['pack' => 'V', 'data' => 0x1E], // null-terminated string prepended by dword string length |
|
802 | - 'data' => ['data' => $dataProp, 'length' => strlen($dataProp)], ]; |
|
800 | + 'offset' => ['pack' => 'V'], |
|
801 | + 'type' => ['pack' => 'V', 'data' => 0x1E], // null-terminated string prepended by dword string length |
|
802 | + 'data' => ['data' => $dataProp, 'length' => strlen($dataProp)], ]; |
|
803 | 803 | ++$dataSection_NumProps; |
804 | 804 | } |
805 | 805 | // Comments (Description) |
806 | 806 | if ($this->spreadsheet->getProperties()->getDescription()) { |
807 | 807 | $dataProp = $this->spreadsheet->getProperties()->getDescription(); |
808 | 808 | $dataSection[] = ['summary' => ['pack' => 'V', 'data' => 0x06], |
809 | - 'offset' => ['pack' => 'V'], |
|
810 | - 'type' => ['pack' => 'V', 'data' => 0x1E], // null-terminated string prepended by dword string length |
|
811 | - 'data' => ['data' => $dataProp, 'length' => strlen($dataProp)], ]; |
|
809 | + 'offset' => ['pack' => 'V'], |
|
810 | + 'type' => ['pack' => 'V', 'data' => 0x1E], // null-terminated string prepended by dword string length |
|
811 | + 'data' => ['data' => $dataProp, 'length' => strlen($dataProp)], ]; |
|
812 | 812 | ++$dataSection_NumProps; |
813 | 813 | } |
814 | 814 | // Last Saved By (LastModifiedBy) |
815 | 815 | if ($this->spreadsheet->getProperties()->getLastModifiedBy()) { |
816 | 816 | $dataProp = $this->spreadsheet->getProperties()->getLastModifiedBy(); |
817 | 817 | $dataSection[] = ['summary' => ['pack' => 'V', 'data' => 0x08], |
818 | - 'offset' => ['pack' => 'V'], |
|
819 | - 'type' => ['pack' => 'V', 'data' => 0x1E], // null-terminated string prepended by dword string length |
|
820 | - 'data' => ['data' => $dataProp, 'length' => strlen($dataProp)], ]; |
|
818 | + 'offset' => ['pack' => 'V'], |
|
819 | + 'type' => ['pack' => 'V', 'data' => 0x1E], // null-terminated string prepended by dword string length |
|
820 | + 'data' => ['data' => $dataProp, 'length' => strlen($dataProp)], ]; |
|
821 | 821 | ++$dataSection_NumProps; |
822 | 822 | } |
823 | 823 | // Created Date/Time |
824 | 824 | if ($this->spreadsheet->getProperties()->getCreated()) { |
825 | 825 | $dataProp = $this->spreadsheet->getProperties()->getCreated(); |
826 | 826 | $dataSection[] = ['summary' => ['pack' => 'V', 'data' => 0x0C], |
827 | - 'offset' => ['pack' => 'V'], |
|
828 | - 'type' => ['pack' => 'V', 'data' => 0x40], // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601) |
|
829 | - 'data' => ['data' => \PhpSpreadsheet\Shared\OLE::localDateToOLE($dataProp)], ]; |
|
827 | + 'offset' => ['pack' => 'V'], |
|
828 | + 'type' => ['pack' => 'V', 'data' => 0x40], // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601) |
|
829 | + 'data' => ['data' => \PhpSpreadsheet\Shared\OLE::localDateToOLE($dataProp)], ]; |
|
830 | 830 | ++$dataSection_NumProps; |
831 | 831 | } |
832 | 832 | // Modified Date/Time |
833 | 833 | if ($this->spreadsheet->getProperties()->getModified()) { |
834 | 834 | $dataProp = $this->spreadsheet->getProperties()->getModified(); |
835 | 835 | $dataSection[] = ['summary' => ['pack' => 'V', 'data' => 0x0D], |
836 | - 'offset' => ['pack' => 'V'], |
|
837 | - 'type' => ['pack' => 'V', 'data' => 0x40], // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601) |
|
838 | - 'data' => ['data' => \PhpSpreadsheet\Shared\OLE::localDateToOLE($dataProp)], ]; |
|
836 | + 'offset' => ['pack' => 'V'], |
|
837 | + 'type' => ['pack' => 'V', 'data' => 0x40], // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601) |
|
838 | + 'data' => ['data' => \PhpSpreadsheet\Shared\OLE::localDateToOLE($dataProp)], ]; |
|
839 | 839 | ++$dataSection_NumProps; |
840 | 840 | } |
841 | 841 | // Security |
842 | 842 | $dataSection[] = ['summary' => ['pack' => 'V', 'data' => 0x13], |
843 | - 'offset' => ['pack' => 'V'], |
|
844 | - 'type' => ['pack' => 'V', 'data' => 0x03], // 4 byte signed integer |
|
845 | - 'data' => ['data' => 0x00], ]; |
|
843 | + 'offset' => ['pack' => 'V'], |
|
844 | + 'type' => ['pack' => 'V', 'data' => 0x03], // 4 byte signed integer |
|
845 | + 'data' => ['data' => 0x00], ]; |
|
846 | 846 | ++$dataSection_NumProps; |
847 | 847 | |
848 | 848 | // 4 Section Length |
@@ -76,7 +76,7 @@ |
||
76 | 76 | |
77 | 77 | private $softEdges = [ |
78 | 78 | 'size' => null, |
79 | - ]; |
|
79 | + ]; |
|
80 | 80 | |
81 | 81 | /** |
82 | 82 | * Get Object State |
@@ -497,7 +497,7 @@ discard block |
||
497 | 497 | (($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) && ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) || |
498 | 498 | (($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) || |
499 | 499 | ($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND) |
500 | - )) { |
|
500 | + )) { |
|
501 | 501 | continue; |
502 | 502 | } |
503 | 503 | |
@@ -509,7 +509,7 @@ discard block |
||
509 | 509 | (($nextToken->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) && ($nextToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_START)) || |
510 | 510 | (($nextToken->getTokenType() == FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($nextToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_START)) || |
511 | 511 | ($nextToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND) |
512 | - )) { |
|
512 | + )) { |
|
513 | 513 | continue; |
514 | 514 | } |
515 | 515 |
@@ -232,7 +232,7 @@ discard block |
||
232 | 232 | 'NULL' => null, |
233 | 233 | ]; |
234 | 234 | |
235 | - // PhpSpreadsheet functions |
|
235 | + // PhpSpreadsheet functions |
|
236 | 236 | private static $phpSpreadsheetFunctions = [ |
237 | 237 | 'ABS' => [ |
238 | 238 | 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, |
@@ -3073,13 +3073,13 @@ discard block |
||
3073 | 3073 | $pCellParent = ($pCell !== null) ? $pCell->getWorksheet() : null; |
3074 | 3074 | |
3075 | 3075 | $regexpMatchString = '/^(' . self::CALCULATION_REGEXP_FUNCTION . |
3076 | - '|' . self::CALCULATION_REGEXP_CELLREF . |
|
3077 | - '|' . self::CALCULATION_REGEXP_NUMBER . |
|
3078 | - '|' . self::CALCULATION_REGEXP_STRING . |
|
3079 | - '|' . self::CALCULATION_REGEXP_OPENBRACE . |
|
3080 | - '|' . self::CALCULATION_REGEXP_NAMEDRANGE . |
|
3081 | - '|' . self::CALCULATION_REGEXP_ERROR . |
|
3082 | - ')/si'; |
|
3076 | + '|' . self::CALCULATION_REGEXP_CELLREF . |
|
3077 | + '|' . self::CALCULATION_REGEXP_NUMBER . |
|
3078 | + '|' . self::CALCULATION_REGEXP_STRING . |
|
3079 | + '|' . self::CALCULATION_REGEXP_OPENBRACE . |
|
3080 | + '|' . self::CALCULATION_REGEXP_NAMEDRANGE . |
|
3081 | + '|' . self::CALCULATION_REGEXP_ERROR . |
|
3082 | + ')/si'; |
|
3083 | 3083 | |
3084 | 3084 | // Start with initialisation |
3085 | 3085 | $index = 0; |
@@ -254,8 +254,8 @@ |
||
254 | 254 | $sheet = $spreadsheet->setActiveSheetIndex($this->sheetIndex); |
255 | 255 | |
256 | 256 | $escapeEnclosures = ['\\' . $this->enclosure, |
257 | - $this->enclosure . $this->enclosure, |
|
258 | - ]; |
|
257 | + $this->enclosure . $this->enclosure, |
|
258 | + ]; |
|
259 | 259 | |
260 | 260 | // Set our starting row based on whether we're in contiguous mode or not |
261 | 261 | $currentRow = 1; |