fixing bug 578, setVPageBreaks doesn't handle multiple value arrays (natel at tocquigny dot com)
git-svn-id: https://svn.php.net/repository/pear/packages/Spreadsheet_Excel_Writer/trunk@155375 c90b9560-bf6c-de11-be94-00142212c4b1
This commit is contained in:
parent
658991d743
commit
f949b35cd5
|
|
@ -2975,15 +2975,25 @@ class Spreadsheet_Excel_Writer_Worksheet extends Spreadsheet_Excel_Writer_BIFFwr
|
||||||
|
|
||||||
$record = 0x001b; // Record identifier
|
$record = 0x001b; // Record identifier
|
||||||
$cbrk = count($breaks); // Number of page breaks
|
$cbrk = count($breaks); // Number of page breaks
|
||||||
|
if ($this->_BIFF_version == 0x0600) {
|
||||||
$length = 2 + 6*$cbrk; // Bytes to follow
|
$length = 2 + 6*$cbrk; // Bytes to follow
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$length = 2 + 2*$cbrk; // Bytes to follow
|
||||||
|
}
|
||||||
|
|
||||||
$header = pack("vv", $record, $length);
|
$header = pack("vv", $record, $length);
|
||||||
$data = pack("v", $cbrk);
|
$data = pack("v", $cbrk);
|
||||||
|
|
||||||
// Append each page break
|
// Append each page break
|
||||||
foreach($breaks as $break) {
|
foreach($breaks as $break) {
|
||||||
|
if ($this->_BIFF_version == 0x0600) {
|
||||||
$data .= pack("vvv", $break, 0x0000, 0x00ff);
|
$data .= pack("vvv", $break, 0x0000, 0x00ff);
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
$data .= pack("v", $break);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$this->_prepend($header.$data);
|
$this->_prepend($header.$data);
|
||||||
}
|
}
|
||||||
|
|
@ -3013,15 +3023,24 @@ class Spreadsheet_Excel_Writer_Worksheet extends Spreadsheet_Excel_Writer_BIFFwr
|
||||||
|
|
||||||
$record = 0x001a; // Record identifier
|
$record = 0x001a; // Record identifier
|
||||||
$cbrk = count($breaks); // Number of page breaks
|
$cbrk = count($breaks); // Number of page breaks
|
||||||
|
if ($this->_BIFF_version == 0x0600)
|
||||||
$length = 2 + 6*$cbrk; // Bytes to follow
|
$length = 2 + 6*$cbrk; // Bytes to follow
|
||||||
|
else {
|
||||||
|
$length = 2 + 2*$cbrk; // Bytes to follow
|
||||||
|
}
|
||||||
|
|
||||||
$header = pack("vv", $record, $length);
|
$header = pack("vv", $record, $length);
|
||||||
$data = pack("v", $cbrk);
|
$data = pack("v", $cbrk);
|
||||||
|
|
||||||
// Append each page break
|
// Append each page break
|
||||||
foreach ($breaks as $break) {
|
foreach ($breaks as $break) {
|
||||||
|
if ($this->_BIFF_version == 0x0600) {
|
||||||
$data .= pack("vvv", $break, 0x0000, 0xffff);
|
$data .= pack("vvv", $break, 0x0000, 0xffff);
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
$data .= pack("v", $break);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$this->_prepend($header.$data);
|
$this->_prepend($header.$data);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue