Skip to content

Commit 7549896

Browse files
committed
#179 : Bugfix for printing slide notes (Unit Tests)
1 parent bfb2a60 commit 7549896

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/PhpPresentation/Writer/PowerPoint2007/PptSlides.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1540,7 +1540,7 @@ protected function writeNote(Note $pNote)
15401540
// p:notes/p:cSld/p:spTree/p:sp[1]/p:nvSpPr
15411541
$objWriter->endElement();
15421542

1543-
// p:notes/p:cSld/p:spTree/p:sp/p:spPr
1543+
// p:notes/p:cSld/p:spTree/p:sp[1]/p:spPr
15441544
$objWriter->startElement('p:spPr');
15451545

15461546
// p:notes/p:cSld/p:spTree/p:sp[1]/p:spPr/a:xfrm

tests/PhpPresentation/Tests/Writer/PowerPoint2007/PptSlidesTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -498,8 +498,8 @@ public function testNote()
498498
$element = '/p:notes/p:cSld/p:spTree/p:sp/p:nvSpPr/p:cNvPr[@id="2"][@name="Slide Image Placeholder 1"]';
499499
$this->assertTrue($pres->elementExists($element, 'ppt/notesSlides/notesSlide1.xml'));
500500
$element = '/p:notes/p:cSld/p:spTree/p:sp[1]/p:spPr/a:xfrm/a:off';
501-
$this->assertEquals(Drawing::pixelsToEmu($oNote->getOffsetX()), $pres->getElementAttribute($element, 'x', 'ppt/notesSlides/notesSlide1.xml'));
502-
$this->assertEquals(Drawing::pixelsToEmu($oNote->getOffsetY()), $pres->getElementAttribute($element, 'y', 'ppt/notesSlides/notesSlide1.xml'));
501+
$this->assertEquals(0, $pres->getElementAttribute($element, 'x', 'ppt/notesSlides/notesSlide1.xml'));
502+
$this->assertEquals(0, $pres->getElementAttribute($element, 'y', 'ppt/notesSlides/notesSlide1.xml'));
503503
$element = '/p:notes/p:cSld/p:spTree/p:sp[1]/p:spPr/a:xfrm/a:ext';
504504
$this->assertEquals(Drawing::pixelsToEmu(round($oNote->getExtentX() / 2)), $pres->getElementAttribute($element, 'cx', 'ppt/notesSlides/notesSlide1.xml'));
505505
$this->assertEquals(Drawing::pixelsToEmu(round($oNote->getExtentY() / 2)), $pres->getElementAttribute($element, 'cy', 'ppt/notesSlides/notesSlide1.xml'));
@@ -511,7 +511,7 @@ public function testNote()
511511
// Notes
512512
$element = '/p:notes/p:cSld/p:spTree/p:sp[2]/p:spPr/a:xfrm/a:off';
513513
$this->assertEquals(Drawing::pixelsToEmu($oNote->getOffsetX()), $pres->getElementAttribute($element, 'x', 'ppt/notesSlides/notesSlide1.xml'));
514-
$this->assertEquals(Drawing::pixelsToEmu(round($oNote->getExtentY() / 2)), $pres->getElementAttribute($element, 'y', 'ppt/notesSlides/notesSlide1.xml'));
514+
$this->assertEquals(Drawing::pixelsToEmu(round($oNote->getExtentY() / 2) + $oNote->getOffsetY()), $pres->getElementAttribute($element, 'y', 'ppt/notesSlides/notesSlide1.xml'));
515515
$element = '/p:notes/p:cSld/p:spTree/p:sp[2]/p:spPr/a:xfrm/a:ext';
516516
$this->assertEquals(5486400, $pres->getElementAttribute($element, 'cx', 'ppt/notesSlides/notesSlide1.xml'));
517517
$this->assertEquals(3600450, $pres->getElementAttribute($element, 'cy', 'ppt/notesSlides/notesSlide1.xml'));

0 commit comments

Comments
 (0)