Clientbase
/
PHPWord
mirror of https://github.com/basemaster/PHPWord.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

check style fixes

This commit is contained in:
troosan 2018-03-21 21:58:41 +01:00
parent 45e2e92af7
commit c08f2718af
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
samples/Sample_32_Chart.php
View File

@ -49,8 +49,14 @@ $section = $phpWord->addSection(array('colsNum' => 2, 'breakType' => 'continuous
$chartTypes = array('pie', 'bar', 'column', 'line', 'area'); $chartTypes = array('pie', 'bar', 'column', 'line', 'area');
$multiSeries = array('bar', 'column', 'line', 'area'); $multiSeries = array('bar', 'column', 'line', 'area');
$style = array('width' => Converter::cmToEmu(5), 'height' => Converter::cmToEmu(4), '3d' => true, $style = array(
'showAxisLabels' => $showAxisLabels, 'showGridX' => $showGridLines, 'showGridY' => $showGridLines); 'width' => Converter::cmToEmu(5),
'height' => Converter::cmToEmu(4),
'3d' => true,
'showAxisLabels' => $showAxisLabels,
'showGridX' => $showGridLines,
'showGridY' => $showGridLines,
);
foreach ($chartTypes as $chartType) { foreach ($chartTypes as $chartType) {
$section->addTitle(ucfirst($chartType), 2); $section->addTitle(ucfirst($chartType), 2);
$chart = $section->addChart($chartType, $categories, $series1, $style); $chart = $section->addChart($chartType, $categories, $series1, $style);

2
src/PhpWord/Writer/Word2007/Part/Chart.php
View File

@ -280,7 +280,7 @@ class Chart extends AbstractPart
} }
$xmlWriter->writeElementBlock('c:crosses', 'val', 'autoZero'); $xmlWriter->writeElementBlock('c:crosses', 'val', 'autoZero');
} }
if (isset($this->options['radar']) || ($type == "cat" && $style->showGridX()) || ($type == "val" && $style->showGridY())) { if (isset($this->options['radar']) || ($type == 'cat' && $style->showGridX()) || ($type == 'val' && $style->showGridY())) {
$xmlWriter->writeElement('c:majorGridlines'); $xmlWriter->writeElement('c:majorGridlines');
} }