Skip to content

Commit b0e7b02

Browse files
committed
#179 : Bugfix for printing slide notes
1 parent 226a490 commit b0e7b02

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

samples/Sample_09_SlideNote.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
->setHeight($oLayout->getCY($oLayout::UNIT_PIXEL))
5656
->setWidth($oLayout->getCX($oLayout::UNIT_PIXEL))
5757
->setOffsetX(170)
58-
->setOffsetY(180);;
58+
->setOffsetY(180);
5959
$oRichText->createTextRun('A class library');
6060
$oRichText->createParagraph()->createTextRun('Written in PHP');
6161
$oRichText->createParagraph()->createTextRun('Representing a presentation');
4.17 MB
Binary file not shown.

src/PhpPresentation/Writer/PowerPoint2007/PptSlides.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ public function writeSlide(Slide $pSlide)
526526
* @param \PhpOffice\PhpPresentation\Shape\Group $group
527527
* @param int $shapeId
528528
*/
529-
private function writeShapeGroup(XMLWriter $objWriter, Group $group, &$shapeId)
529+
protected function writeShapeGroup(XMLWriter $objWriter, Group $group, &$shapeId)
530530
{
531531
// p:grpSp
532532
$objWriter->startElement('p:grpSp');
@@ -614,7 +614,7 @@ private function writeShapeGroup(XMLWriter $objWriter, Group $group, &$shapeId)
614614
* @param \PhpOffice\PhpPresentation\Shape\Chart $shape
615615
* @param int $shapeId
616616
*/
617-
private function writeShapeChart(XMLWriter $objWriter, ShapeChart $shape, $shapeId)
617+
protected function writeShapeChart(XMLWriter $objWriter, ShapeChart $shape, $shapeId)
618618
{
619619
// p:graphicFrame
620620
$objWriter->startElement('p:graphicFrame');
@@ -684,7 +684,7 @@ private function writeShapeChart(XMLWriter $objWriter, ShapeChart $shape, $shape
684684
* @param int $shapeId
685685
* @throws \Exception
686686
*/
687-
private function writeShapePic(XMLWriter $objWriter, AbstractDrawing $shape, $shapeId)
687+
protected function writeShapePic(XMLWriter $objWriter, AbstractDrawing $shape, $shapeId)
688688
{
689689
// p:pic
690690
$objWriter->startElement('p:pic');
@@ -785,7 +785,7 @@ private function writeShapePic(XMLWriter $objWriter, AbstractDrawing $shape, $sh
785785
* @param int $shapeId
786786
* @throws \Exception
787787
*/
788-
private function writeShapeText(XMLWriter $objWriter, RichText $shape, $shapeId)
788+
protected function writeShapeText(XMLWriter $objWriter, RichText $shape, $shapeId)
789789
{
790790
// p:sp
791791
$objWriter->startElement('p:sp');
@@ -925,7 +925,7 @@ private function writeShapeText(XMLWriter $objWriter, RichText $shape, $shapeId)
925925
* @param int $shapeId
926926
* @throws \Exception
927927
*/
928-
private function writeShapeTable(XMLWriter $objWriter, ShapeTable $shape, $shapeId)
928+
protected function writeShapeTable(XMLWriter $objWriter, ShapeTable $shape, $shapeId)
929929
{
930930
// p:graphicFrame
931931
$objWriter->startElement('p:graphicFrame');
@@ -1144,7 +1144,7 @@ private function writeShapeTable(XMLWriter $objWriter, ShapeTable $shape, $shape
11441144
* @param \PhpOffice\PhpPresentation\Shape\RichText\Paragraph[] $paragraphs
11451145
* @throws \Exception
11461146
*/
1147-
private function writeParagraphs(XMLWriter $objWriter, $paragraphs)
1147+
protected function writeParagraphs(XMLWriter $objWriter, $paragraphs)
11481148
{
11491149
// Loop trough paragraphs
11501150
foreach ($paragraphs as $paragraph) {
@@ -1270,7 +1270,7 @@ private function writeParagraphs(XMLWriter $objWriter, $paragraphs)
12701270
* @param \PhpOffice\PhpPresentation\Shape\Line $shape
12711271
* @param int $shapeId
12721272
*/
1273-
private function writeShapeLine(XMLWriter $objWriter, Line $shape, $shapeId)
1273+
protected function writeShapeLine(XMLWriter $objWriter, Line $shape, $shapeId)
12741274
{
12751275
// p:sp
12761276
$objWriter->startElement('p:cxnSp');
@@ -1538,8 +1538,8 @@ protected function writeNote(Note $pNote)
15381538
$objWriter->startElement('a:xfrm');
15391539
//a:off
15401540
$objWriter->startElement('a:off');
1541-
$objWriter->writeAttribute('x', CommonDrawing::pixelsToEmu($pNote->getOffsetX()));
1542-
$objWriter->writeAttribute('y', CommonDrawing::pixelsToEmu($pNote->getOffsetY()));
1541+
$objWriter->writeAttribute('x', 0);
1542+
$objWriter->writeAttribute('y', 0);
15431543
$objWriter->endElement();
15441544
//a:ext
15451545
$objWriter->startElement('a:ext');
@@ -1622,7 +1622,7 @@ protected function writeNote(Note $pNote)
16221622
// p:spPr > a:xfrm > :off
16231623
$objWriter->startElement('a:off');
16241624
$objWriter->writeAttribute('x', CommonDrawing::pixelsToEmu($pNote->getOffsetX()));
1625-
$objWriter->writeAttribute('y', CommonDrawing::pixelsToEmu(round($pNote->getExtentY() / 2)));
1625+
$objWriter->writeAttribute('y', CommonDrawing::pixelsToEmu(round($pNote->getExtentY() / 2) + $pNote->getOffsetY()));
16261626
$objWriter->endElement();
16271627

16281628
// p:spPr > a:xfrm > a:ext
@@ -1688,7 +1688,7 @@ protected function writeNote(Note $pNote)
16881688
* @param XMLWriter $objWriter
16891689
* @param Transition $transition
16901690
*/
1691-
public function writeTransition(XMLWriter $objWriter, Transition $transition)
1691+
protected function writeTransition(XMLWriter $objWriter, Transition $transition)
16921692
{
16931693
$objWriter->startElement('p:transition');
16941694
if (!is_null($transition->getSpeed())) {

0 commit comments

Comments
 (0)