Subversion Repositories eFlore/Applications.cel

Rev

Rev 970 | Rev 1604 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 970 Rev 996
Line 644... Line 644...
644 
    {
 644 
    {
645 
        $class = 2; // as far as I know, this is magick.
 645 
        $class = 2; // as far as I know, this is magick.
Line 646... Line 646...
646
646
647 
        // Split the range into 2 cell refs
 647 
        // Split the range into 2 cell refs
648 
        if(preg_match("/^([A-I]?[A-Z])(\d+)\:([A-I]?[A-Z])(\d+)$/",$range)) {
 648 
        if(preg_match("/^([A-I]?[A-Z])(\d+)\:([A-I]?[A-Z])(\d+)$/",$range)) {
649 
            list($cell1, $cell2) = split(':', $range);
 649 
            list($cell1, $cell2) = explode(':', $range);
650 
        }
 650 
        }
651 
        elseif(preg_match("/^([A-I]?[A-Z])(\d+)\.\.([A-I]?[A-Z])(\d+)$/",$range)) {
 651 
        elseif(preg_match("/^([A-I]?[A-Z])(\d+)\.\.([A-I]?[A-Z])(\d+)$/",$range)) {
Line 652... Line 652...
652 
            list($cell1, $cell2) = split('\.\.', $range);
 652 
            list($cell1, $cell2) = explode('\.\.', $range);
653
653
654 
        }
 654 
        }
655 
        else {
 655 
        else {
Line 696... Line 696...
696 
    function _convertRange3d($token)
 696 
    function _convertRange3d($token)
697 
    {
 697 
    {
698 
        $class = 2; // as far as I know, this is magick.
 698 
        $class = 2; // as far as I know, this is magick.
Line 699... Line 699...
699
699
700 
        // Split the ref at the ! symbol
 700 
        // Split the ref at the ! symbol
Line 701... Line 701...
701 
        list($ext_ref, $range) = split('!', $token);
 701 
        list($ext_ref, $range) = explode('!', $token);
702
702
703 
        // Convert the external reference part
 703 
        // Convert the external reference part
704 
        $ext_ref = $this->_packExtRef($ext_ref);
 704 
        $ext_ref = $this->_packExtRef($ext_ref);
705 
        if ($this->isError($ext_ref)) {
 705 
        if ($this->isError($ext_ref)) {
Line 706... Line 706...
706 
            return $ext_ref;
 706 
            return $ext_ref;
707 
        }
 707 
        }
Line 708... Line 708...
708
708
709 
        // Split the range into 2 cell refs
 709 
        // Split the range into 2 cell refs
710 
        list($cell1, $cell2) = split(':', $range);
 710 
        list($cell1, $cell2) = explode(':', $range);
711
711
Line 794... Line 794...
794 
    function _convertRef3d($cell)
 794 
    function _convertRef3d($cell)
795 
    {
 795 
    {
796 
        $class = 2; // as far as I know, this is magick.
 796 
        $class = 2; // as far as I know, this is magick.
Line 797... Line 797...
797
797
798 
        // Split the ref at the ! symbol
 798 
        // Split the ref at the ! symbol
Line 799... Line 799...
799 
        list($ext_ref, $cell) = split('!', $cell);
 799 
        list($ext_ref, $cell) = explode('!', $cell);
800
800
801 
        // Convert the external reference part
 801 
        // Convert the external reference part
802 
        $ext_ref = $this->_packExtRef($ext_ref);
 802 
        $ext_ref = $this->_packExtRef($ext_ref);
Line 838... Line 838...
838 
        $ext_ref = preg_replace("/'$/", '', $ext_ref); // Remove trailing ' if any.
 838 
        $ext_ref = preg_replace("/'$/", '', $ext_ref); // Remove trailing ' if any.
Line 839... Line 839...
839
839
840 
        // Check if there is a sheet range eg., Sheet1:Sheet2.
 840 
        // Check if there is a sheet range eg., Sheet1:Sheet2.
841 
        if (preg_match("/:/", $ext_ref))
 841 
        if (preg_match("/:/", $ext_ref))
842 
        {
 842 
        {
Line 843... Line 843...
843 
            list($sheet_name1, $sheet_name2) = split(':', $ext_ref);
 843 
            list($sheet_name1, $sheet_name2) = explode(':', $ext_ref);
844
844
845 
            $sheet1 = $this->_getSheetIndex($sheet_name1);
 845 
            $sheet1 = $this->_getSheetIndex($sheet_name1);
846 
            if ($sheet1 == -1) {
 846 
            if ($sheet1 == -1) {