Skip to content

Commit 20410e0

Browse files
Progi1984Progi1984
committed
ADDED : UnitTests (87.27% Lines)
1 parent e360b05 commit 20410e0

File tree

5 files changed

+898
-146
lines changed

5 files changed

+898
-146
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ vendor
1616
/samples/results
1717
/phpunit.bat
1818
/todo.txt
19+
/samples/Sample_00_Test.php

‎src/PhpPowerpoint/Writer/PowerPoint2007/Chart.php

Lines changed: 5 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -931,12 +931,10 @@ protected function writeTypeBar3D(XMLWriter $objWriter, Bar3D $subject, $include
931931
$objWriter->endElement();
932932

933933
// c:tx
934-
if (class_exists('PHPExcel_Cell')) {
935-
$objWriter->startElement('c:tx');
936-
$coords = ($includeSheet ? 'Sheet1!$' . PHPExcel_Cell::stringFromColumnIndex(1 + $seriesIndex) . '$1' : '');
937-
$this->writeSingleValueOrReference($objWriter, $includeSheet, $series->getTitle(), $coords);
938-
$objWriter->endElement();
939-
}
934+
$objWriter->startElement('c:tx');
935+
$coords = ($includeSheet ? 'Sheet1!$' . PHPExcel_Cell::stringFromColumnIndex(1 + $seriesIndex) . '$1' : '');
936+
$this->writeSingleValueOrReference($objWriter, $includeSheet, $series->getTitle(), $coords);
937+
$objWriter->endElement();
940938

941939
// Fills for points?
942940
$dataPointFills = $series->getDataPointFills();
@@ -1316,26 +1314,6 @@ protected function writeTypeLine(XMLWriter $objWriter, Line $subject, $includeSh
13161314
$this->writeSingleValueOrReference($objWriter, $includeSheet, $series->getTitle(), $coords);
13171315
$objWriter->endElement();
13181316

1319-
// Fills for points?
1320-
$dataPointFills = $series->getDataPointFills();
1321-
foreach ($dataPointFills as $key => $value) {
1322-
// c:dPt
1323-
$objWriter->startElement('c:dPt');
1324-
1325-
// c:idx
1326-
$this->writeElementWithValAttribute($objWriter, 'c:idx', $key);
1327-
1328-
// c:spPr
1329-
$objWriter->startElement('c:spPr');
1330-
1331-
// Write fill
1332-
$this->writeFill($objWriter, $value);
1333-
1334-
$objWriter->endElement();
1335-
1336-
$objWriter->endElement();
1337-
}
1338-
13391317
// c:dLbls
13401318
$objWriter->startElement('c:dLbls');
13411319

@@ -1530,27 +1508,7 @@ protected function writeTypeScatter(XMLWriter $objWriter, Scatter $subject, $inc
15301508
$objWriter->endElement();
15311509

15321510
$objWriter->endElement();
1533-
/*
1534-
// Fills for points?
1535-
$dataPointFills = $series->getDataPointFills();
1536-
foreach ($dataPointFills as $key => $value) {
1537-
// c:dPt
1538-
$objWriter->startElement('c:dPt');
1539-
1540-
// c:idx
1541-
$this->writeElementWithValAttribute($objWriter, 'c:idx', $key);
1542-
1543-
// c:spPr
1544-
$objWriter->startElement('c:spPr');
1545-
1546-
// Write fill
1547-
$this->writeFill($objWriter, $value);
1548-
1549-
$objWriter->endElement();
1550-
1551-
$objWriter->endElement();
1552-
}
1553-
*/
1511+
15541512
// c:dLbls
15551513
$objWriter->startElement('c:dLbls');
15561514

‎src/PhpPowerpoint/Writer/PowerPoint2007/Slide.php

Lines changed: 0 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -254,11 +254,6 @@ private function writeShapePic(XMLWriter $objWriter, AbstractDrawing $shape, $sh
254254
$objWriter->writeAttribute('name', $shape->getName());
255255
$objWriter->writeAttribute('descr', $shape->getDescription());
256256

257-
// a:hlinkClick
258-
if ($shape->hasHyperlink()) {
259-
$this->writeHyperlink($objWriter, $shape);
260-
}
261-
262257
$objWriter->endElement();
263258

264259
// p:cNvPicPr
@@ -379,11 +374,6 @@ private function writeShapeText(XMLWriter $objWriter, RichText $shape, $shapeId)
379374
$objWriter->writeAttribute('id', $shapeId);
380375
$objWriter->writeAttribute('name', '');
381376

382-
// a:hlinkClick
383-
if ($shape->hasHyperlink()) {
384-
$this->writeHyperlink($objWriter, $shape);
385-
}
386-
387377
$objWriter->endElement();
388378

389379
// p:cNvSpPr
@@ -422,40 +412,6 @@ private function writeShapeText(XMLWriter $objWriter, RichText $shape, $shapeId)
422412
$objWriter->writeAttribute('prst', 'rect');
423413
$objWriter->endElement();
424414

425-
$this->writeFill($objWriter, $shape->getFill());
426-
427-
if ($shape->getBorder()->getLineStyle() != Border::LINE_NONE) {
428-
$this->writeBorder($objWriter, $shape->getBorder(), '');
429-
}
430-
431-
if ($shape->getShadow()->isVisible()) {
432-
// a:effectLst
433-
$objWriter->startElement('a:effectLst');
434-
435-
// a:outerShdw
436-
$objWriter->startElement('a:outerShdw');
437-
$objWriter->writeAttribute('blurRad', SharedDrawing::pixelsToEmu($shape->getShadow()->getBlurRadius()));
438-
$objWriter->writeAttribute('dist', SharedDrawing::pixelsToEmu($shape->getShadow()->getDistance()));
439-
$objWriter->writeAttribute('dir', SharedDrawing::degreesToAngle($shape->getShadow()->getDirection()));
440-
$objWriter->writeAttribute('algn', $shape->getShadow()->getAlignment());
441-
$objWriter->writeAttribute('rotWithShape', '0');
442-
443-
// a:srgbClr
444-
$objWriter->startElement('a:srgbClr');
445-
$objWriter->writeAttribute('val', $shape->getShadow()->getColor()->getRGB());
446-
447-
// a:alpha
448-
$objWriter->startElement('a:alpha');
449-
$objWriter->writeAttribute('val', $shape->getShadow()->getAlpha() * 1000);
450-
$objWriter->endElement();
451-
452-
$objWriter->endElement();
453-
454-
$objWriter->endElement();
455-
456-
$objWriter->endElement();
457-
}
458-
459415
$objWriter->endElement();
460416

461417
// p:txBody
@@ -521,11 +477,6 @@ private function writeShapeTable(XMLWriter $objWriter, Table $shape, $shapeId)
521477
$objWriter->writeAttribute('name', $shape->getName());
522478
$objWriter->writeAttribute('descr', $shape->getDescription());
523479

524-
// a:hlinkClick
525-
if ($shape->hasHyperlink()) {
526-
$this->writeHyperlink($objWriter, $shape);
527-
}
528-
529480
$objWriter->endElement();
530481

531482
// p:cNvGraphicFramePr
@@ -575,34 +526,6 @@ private function writeShapeTable(XMLWriter $objWriter, Table $shape, $shapeId)
575526
$objWriter->writeAttribute('firstRow', '1');
576527
$objWriter->writeAttribute('bandRow', '1');
577528

578-
if ($shape->getShadow()->isVisible()) {
579-
// a:effectLst
580-
$objWriter->startElement('a:effectLst');
581-
582-
// a:outerShdw
583-
$objWriter->startElement('a:outerShdw');
584-
$objWriter->writeAttribute('blurRad', SharedDrawing::pixelsToEmu($shape->getShadow()->getBlurRadius()));
585-
$objWriter->writeAttribute('dist', SharedDrawing::pixelsToEmu($shape->getShadow()->getDistance()));
586-
$objWriter->writeAttribute('dir', SharedDrawing::degreesToAngle($shape->getShadow()->getDirection()));
587-
$objWriter->writeAttribute('algn', $shape->getShadow()->getAlignment());
588-
$objWriter->writeAttribute('rotWithShape', '0');
589-
590-
// a:srgbClr
591-
$objWriter->startElement('a:srgbClr');
592-
$objWriter->writeAttribute('val', $shape->getShadow()->getColor()->getRGB());
593-
594-
// a:alpha
595-
$objWriter->startElement('a:alpha');
596-
$objWriter->writeAttribute('val', $shape->getShadow()->getAlpha() * 1000);
597-
$objWriter->endElement();
598-
599-
$objWriter->endElement();
600-
601-
$objWriter->endElement();
602-
603-
$objWriter->endElement();
604-
}
605-
606529
$objWriter->endElement();
607530

608531
// a:tblGrid
@@ -892,11 +815,6 @@ private function writeShapeLine(XMLWriter $objWriter, Line $shape, $shapeId)
892815
$objWriter->writeAttribute('id', $shapeId);
893816
$objWriter->writeAttribute('name', '');
894817

895-
// a:hlinkClick
896-
if ($shape->hasHyperlink()) {
897-
$this->writeHyperlink($objWriter, $shape);
898-
}
899-
900818
$objWriter->endElement();
901819

902820
// p:cNvCxnSpPr
@@ -983,23 +901,6 @@ private function writeShapeLine(XMLWriter $objWriter, Line $shape, $shapeId)
983901
$objWriter->endElement();
984902
}
985903

986-
/**
987-
* Write Borders
988-
*
989-
* @param \PhpOffice\PhpPowerpoint\Shared\XMLWriter $objWriter XML Writer
990-
* @param \PhpOffice\PhpPowerpoint\Style\Borders $pBorders Borders
991-
* @throws \Exception
992-
*/
993-
protected function writeBorders(XMLWriter $objWriter, Borders $pBorders)
994-
{
995-
$this->writeBorder($objWriter, $pBorders->getLeft(), 'L');
996-
$this->writeBorder($objWriter, $pBorders->getRight(), 'R');
997-
$this->writeBorder($objWriter, $pBorders->getTop(), 'T');
998-
$this->writeBorder($objWriter, $pBorders->getBottom(), 'B');
999-
$this->writeBorder($objWriter, $pBorders->getDiagonalDown(), 'TlToBr');
1000-
$this->writeBorder($objWriter, $pBorders->getDiagonalUp(), 'BlToTr');
1001-
}
1002-
1003904
/**
1004905
* Write Border
1005906
*

0 commit comments

Comments
 (0)