mcndave/spout
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hopefullythelastone

Browse Source
This commit is contained in:
willkensonh 2018-10-15 14:36:09 +11:00
parent 937a91f687
commit a88adcaf36
3 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Spout/Common/Entity/Style/NumberFormat.php
View File

@ -36,16 +36,6 @@ class NumberFormat
}
}
/**
* @param int $id
* @return NumberFormat
*/
public function setId($id)
{
$this->id = $id;
return $this;
}
/**
* @param bool $commas
* @return NumberFormat
@ -56,14 +46,6 @@ class NumberFormat
return $this;
}
/**
* @return int|null
*/
public function getId()
{
return $this->id;
}
/**
* @param int $type
* @return NumberFormat

3
src/Spout/Writer/XLSX/Manager/Style/StyleManager.php
View File

@ -75,7 +75,8 @@ EOD;
foreach ($registeredFormats as $styleId) {
$style = $this->styleRegistry->getStyleFromStyleId($styleId);
$format = $style->getNumberFormat();
$content .= '<numFmt numFmtId="'.$format->getId().'" formatCode="'.$format->getFormatCode().'"/>';
$formatId = $this->styleRegistry->getNumberFormatIdForStyleId($styleId);
$content .= '<numFmt numFmtId="'.$formatId.'" formatCode="'.$format->getFormatCode().'"/>';
}
$content .= '</numFmts>';

4
src/Spout/Writer/XLSX/Manager/Style/StyleRegistry.php
View File

@ -121,10 +121,8 @@ class StyleRegistry extends \Box\Spout\Writer\Common\Manager\Style\StyleRegistry
$registeredFormatId = $this->styleIdToNumberFormatMappingTable[$registeredStyleId];
$this->styleIdToNumberFormatMappingTable[$styleId] = $registeredFormatId;
} else {
$formatId = count($this->registeredNumberFormats);
$this->registeredNumberFormats[$serializedFormat] = $styleId;
$this->styleIdToNumberFormatMappingTable[$styleId] = $formatId;
$format->setId($formatId);
$this->styleIdToNumberFormatMappingTable[$styleId] = count($this->registeredNumberFormats);
}
} else {
// The fillId maps a style to a fill declaration