Subversion Repositories eFlore/Applications.cel

Compare Revisions

Ignore whitespace Rev 1644 → Rev 1604

/trunk/jrest/lib/Spreadsheet/Excel/Writer/Worksheet.php
1334,7 → 1334,7
* @access private
* @param string $data The binary data to append
*/
function _append(&$data)
function _append($data)
{
if ($this->_using_tmpfile) {
// Add CONTINUE records if necessary
1534,8 → 1534,7
$xl_double = strrev($xl_double);
}
 
$data = $header . $data . $xl_double;
$this->_append($data);
$this->_append($header.$data.$xl_double);
return(0);
}
 
1595,9 → 1594,7
 
$header = pack("vv", $record, $length);
$data = pack("vvvv", $row, $col, $xf, $strlen);
 
$data = $header . $data . $str;
$this->_append($data);
$this->_append($header . $data . $str);
return($str_error);
}
 
1669,9 → 1666,7
 
$header = pack('vv', $record, $length);
$data = pack('vvvV', $row, $col, $xf, $this->_str_table[$str]);
$data = $header . $data;
 
$this->_append($data);
$this->_append($header.$data);
return $str_error;
}
 
1747,19 → 1742,15
// Length for this record is no more than 2048 + 6
$length = 0x0006 + min($note_length, 2048);
$header = pack("vv", $record, $length);
$data = pack("vvv", $row, $col, $note_length) . substr($note, 0, 2048);
$data = $header . $data;
$data = pack("vvv", $row, $col, $note_length);
$this->_append($header . $data . substr($note, 0, 2048));
 
$this->_append($data);
 
for ($i = $max_length; $i < $note_length; $i += $max_length) {
$chunk = substr($note, $i, $max_length);
$length = 0x0006 + strlen($chunk);
$header = pack("vv", $record, $length);
$data = pack("vvv", -1, 0, strlen($chunk)) . $chunk;
$data = $header . $data;
 
$this->_append($data);
$data = pack("vvv", -1, 0, strlen($chunk));
$this->_append($header.$data.$chunk);
}
return(0);
}
1814,9 → 1805,7
 
$header = pack("vv", $record, $length);
$data = pack("vvv", $row, $col, $xf);
$data = $header . $data;
 
$this->_append($data);
$this->_append($header . $data);
return 0;
}
 
1886,9 → 1875,8
$header = pack("vv", $record, $length);
$data = pack("vvvdvVv", $row, $col, $xf, $num,
$grbit, $unknown, $formlen);
$data = $header . $data . $formula;
 
$this->_append($data);
$this->_append($header . $data . $formula);
return 0;
}
 
2008,10 → 1996,10
$header = pack("vv", $record, $length);
$data = pack("vvvv", $row1, $row2, $col1, $col2);
 
$data = $header . $data . $unknown1 . $options . $unknown2 . $url_len . $url;
 
// Write the packed data
$this->_append($data);
$this->_append($header . $data .
$unknown1 . $options .
$unknown2 . $url_len . $url);
return($str_error);
}
 
2070,10 → 2058,10
$header = pack("vv", $record, $length);
$data = pack("vvvv", $row1, $row2, $col1, $col2);
 
$data = $header . $data . $unknown1 . $options . $url_len . $url;
 
// Write the packed data
$this->_append($data);
$this->_append($header . $data .
$unknown1 . $options .
$url_len . $url);
return($str_error);
}
 
2207,10 → 2195,9
// Pack the header data
$length = strlen($data);
$header = pack("vv", $record, $length);
$data = $header. $data;
 
// Write the packed data
$this->_append($data);
$this->_append($header. $data);
return($str_error);
}
 
2271,8 → 2258,7
$header = pack("vv", $record, $length);
$data = pack("vvvvvvvv", $row, $colMic, $colMac, $miyRw,
$irwMac,$reserved, $grbit, $ixfe);
$data = $header . $data;
$this->_append($data);
$this->_append($header.$data);
}
 
/**
2358,9 → 2344,7
$zoom_factor_normal = 0x0000;
$data .= pack("vvvvV", $rgbHdr, 0x0000, $zoom_factor_page_break, $zoom_factor_normal, 0x00000000);
}
$data = $header.$data;
 
$this->_append($data);
$this->_append($header.$data);
}
 
/**
2480,9 → 2464,7
$irefAct, $cref,
$rwFirst, $rwLast,
$colFirst, $colLast);
$data = $header . $data;
 
$this->_append($data);
$this->_append($header . $data);
}
 
/**
2504,9 → 2486,8
$data = pack('v', count($ranges));
foreach($ranges as $range)
$data .= pack('vvvv', $range[0], $range[2], $range[1], $range[3]);
$string = $header . $data;
 
$this->_append($string);
$string=$header.$data;
$this->_append(&$string, true);
}
}
 
2643,8 → 2624,7
 
$header = pack("vv", $record, $length);
$data = pack("vvvvv", $x, $y, $rwTop, $colLeft, $pnnAct);
$data = $header . $data;
$this->_append($data);
$this->_append($header . $data);
}
 
/**
2912,8 → 2892,8
$header = pack("vv", $record, $length);
$data = pack("vvvvv", $cref, $first_row, $last_row,
$first_col, $last_col);
$data = $header . $data;
$this->_append($data);
 
$this->_append($header.$data);
}
 
/**
3230,8 → 3210,7
$lcb = $size;
 
$header = pack("vvvvV", $record, $length, $cf, $env, $lcb);
$data = $header . $data;
$this->_append($data);
$this->_append($header.$data);
}
 
/**
3466,8 → 3445,7
$data .= pack("v", $grbit2);
$data .= pack("V", $Reserved5);
 
$data = $header . $data;
$this->_append($data);
$this->_append($header . $data);
}
 
/**
3575,8 → 3553,7
 
$header = pack("vv", $record, $length);
$data = pack("vv", $this->_zoom, 100);
$data = $header . $data;
$this->_append($data);
$this->_append($header . $data);
}
 
/**
3606,15 → 3583,13
$header = pack('vv', $record, $length);
$data = pack('vVVVV', $grbit, $horPos, $verPos, $objId,
count($this->_dv));
$data = $header . $data;
$this->_append($data);
$this->_append($header.$data);
 
$record = 0x01be; // Record identifier
foreach ($this->_dv as $dv) {
$length = strlen($dv); // Bytes to follow
$header = pack("vv", $record, $length);
$header .= $dv;
$this->_append($header);
$this->_append($header . $dv);
}
}
}
/trunk/jrest/lib/Spreadsheet/Excel/Writer/Workbook.php
882,8 → 882,7
$header = pack('vv', $record, $length);
$data = pack('v', $cv);
 
$data = $header . $data;
$this->_append($data);
$this->_append($header . $data);
}
 
/**
913,8 → 912,7
$grbit,
$itabCur, $itabFirst,
$ctabsel, $wTabRatio);
$data = $header . $data;
$this->_append($data);
$this->_append($header . $data);
}
 
/**
947,9 → 945,7
} else {
$data = pack("VvC", $offset, $grbit, $cch);
}
 
$data = $header.$data.$sheetname;
$this->_append($data);
$this->_append($header.$data.$sheetname);
}
 
/**
964,8 → 960,7
 
$header = pack("vv", $record, $length);
$data = pack("vv", count($this->_worksheets), 0x0104);
$data = $header . $data;
$this->_append($data);
$this->_append($header . $data);
}
 
/**
987,8 → 982,7
for ($i = 0; $i < $total_references; $i++) {
$data .= $this->_parser->_references[$i];
}
$data = $header . $data;
$this->_append($data);
$this->_append($header . $data);
}
 
/**
1007,8 → 1001,7
 
$header = pack("vv", $record, $length);
$data = pack("vCC", $ixfe, $BuiltIn, $iLevel);
$data = $header . $data;
$this->_append($data);
$this->_append($header . $data);
}
 
 
1049,8 → 1042,7
$header = pack("vv", $record, 3 + $length);
$data = pack("vC", $ifmt, $cch);
}
$data = $header . $data . $format;
$this->_append($data);
$this->_append($header . $data . $format);
}
 
/**
1067,8 → 1059,7
 
$header = pack("vv", $record, $length);
$data = pack("v", $f1904);
$data = $header . $data;
$this->_append($data);
$this->_append($header . $data);
}
 
 
1092,8 → 1083,7
 
$header = pack("vv", $record, $length);
$data = pack("v", $cxals);
$data = $header . $data;
$this->_append($data);
$this->_append($header . $data);
}
 
 
1117,8 → 1107,7
 
$header = pack("vv", $record, $length);
$data = pack("CC", $cch, $rgch);
$data = $header . $data . $sheetname;
$this->_append($data);
$this->_append($header . $data . $sheetname);
}
 
 
1182,8 → 1171,7
$data .= pack("v", $rowmax);
$data .= pack("C", $colmin);
$data .= pack("C", $colmax);
$data = $header . $data;
$this->_append($data);
$this->_append($header . $data);
}
 
 
1268,8 → 1256,7
$data .= pack("C", 0xff);
// End of data
$data .= pack("C", 0x10);
$data = $header . $data;
$this->_append($data);
$this->_append($header . $data);
}
 
/**
1285,8 → 1272,7
$header = pack('vv', $record, $length);
/* using the same country code always for simplicity */
$data = pack('vv', $this->_country_code, $this->_country_code);
$data = $header . $data;
$this->_append($data);
$this->_append($header . $data);
}
 
/**
1311,8 → 1297,7
}
 
$header = pack("vvv", $record, $length, $ccv);
$data = $header . $data;
$this->_append($data);
$this->_append($header . $data);
}
 
/**
1503,8 → 1488,7
// Write the SST block header information
$header = pack("vv", $record, $length);
$data = pack("VV", $this->_str_total, $this->_str_unique);
$data = $header . $data;
$this->_append($data);
$this->_append($header . $data);
 
 
 
/trunk/jrest/lib/Spreadsheet/Excel/Writer/BIFFwriter.php
156,7 → 156,7
* @param string $data binary data to append
* @access private
*/
function _append(&$data)
function _append($data)
{
if (strlen($data) > $this->_limit) {
$data = $this->_addContinue($data);