Merge branch 'issue179' of https://github.com/Progi1984/PHPPresentation into issue179

Author: Progi1984

src/PhpPresentation/Writer/PowerPoint2007/PptSlides.php

@@ -526,7 +526,7 @@ public function writeSlide(Slide $pSlide)
      * @param \PhpOffice\PhpPresentation\Shape\Group $group
      * @param  int $shapeId
      */
-    private function writeShapeGroup(XMLWriter $objWriter, Group $group, &$shapeId)
+    protected function writeShapeGroup(XMLWriter $objWriter, Group $group, &$shapeId)
     {
         // p:grpSp
         $objWriter->startElement('p:grpSp');
@@ -614,7 +614,7 @@ private function writeShapeGroup(XMLWriter $objWriter, Group $group, &$shapeId)
      * @param \PhpOffice\PhpPresentation\Shape\Chart $shape
      * @param  int $shapeId
      */
-    private function writeShapeChart(XMLWriter $objWriter, ShapeChart $shape, $shapeId)
+    protected function writeShapeChart(XMLWriter $objWriter, ShapeChart $shape, $shapeId)
     {
         // p:graphicFrame
         $objWriter->startElement('p:graphicFrame');
@@ -684,7 +684,7 @@ private function writeShapeChart(XMLWriter $objWriter, ShapeChart $shape, $shape
      * @param  int $shapeId
      * @throws \Exception
      */
-    private function writeShapePic(XMLWriter $objWriter, AbstractDrawing $shape, $shapeId)
+    protected function writeShapePic(XMLWriter $objWriter, AbstractDrawing $shape, $shapeId)
     {
         // p:pic
         $objWriter->startElement('p:pic');
@@ -785,7 +785,7 @@ private function writeShapePic(XMLWriter $objWriter, AbstractDrawing $shape, $sh
      * @param  int                            $shapeId
      * @throws \Exception
      */
-    private function writeShapeText(XMLWriter $objWriter, RichText $shape, $shapeId)
+    protected function writeShapeText(XMLWriter $objWriter, RichText $shape, $shapeId)
     {
         // p:sp
         $objWriter->startElement('p:sp');
@@ -925,7 +925,7 @@ private function writeShapeText(XMLWriter $objWriter, RichText $shape, $shapeId)
      * @param  int                            $shapeId
      * @throws \Exception
      */
-    private function writeShapeTable(XMLWriter $objWriter, ShapeTable $shape, $shapeId)
+    protected function writeShapeTable(XMLWriter $objWriter, ShapeTable $shape, $shapeId)
     {
         // p:graphicFrame
         $objWriter->startElement('p:graphicFrame');
@@ -1144,7 +1144,7 @@ private function writeShapeTable(XMLWriter $objWriter, ShapeTable $shape, $shape
      * @param  \PhpOffice\PhpPresentation\Shape\RichText\Paragraph[] $paragraphs
      * @throws \Exception
      */
-    private function writeParagraphs(XMLWriter $objWriter, $paragraphs)
+    protected function writeParagraphs(XMLWriter $objWriter, $paragraphs)
     {
         // Loop trough paragraphs
         foreach ($paragraphs as $paragraph) {
@@ -1270,7 +1270,7 @@ private function writeParagraphs(XMLWriter $objWriter, $paragraphs)
      * @param \PhpOffice\PhpPresentation\Shape\Line $shape
      * @param  int $shapeId
      */
-    private function writeShapeLine(XMLWriter $objWriter, Line $shape, $shapeId)
+    protected function writeShapeLine(XMLWriter $objWriter, Line $shape, $shapeId)
     {
         // p:sp
         $objWriter->startElement('p:cxnSp');
@@ -1548,8 +1548,8 @@ protected function writeNote(Note $pNote)
 
         // p:notes/p:cSld/p:spTree/p:sp[1]/p:spPr/a:xfrm/a:off
         $objWriter->startElement('a:off');
-        $objWriter->writeAttribute('x', CommonDrawing::pixelsToEmu($pNote->getOffsetX()));
-        $objWriter->writeAttribute('y', CommonDrawing::pixelsToEmu($pNote->getOffsetY()));
+        $objWriter->writeAttribute('x', 0);
+        $objWriter->writeAttribute('y', 0);
         $objWriter->endElement();
 
         // p:notes/p:cSld/p:spTree/p:sp[1]/p:spPr/a:xfrm/a:ext
@@ -1646,7 +1646,7 @@ protected function writeNote(Note $pNote)
         // p:notes/p:cSld/p:spTree/p:sp[2]/p:spPr/a:xfrm/a:off
         $objWriter->startElement('a:off');
         $objWriter->writeAttribute('x', CommonDrawing::pixelsToEmu($pNote->getOffsetX()));
-        $objWriter->writeAttribute('y', CommonDrawing::pixelsToEmu(round($pNote->getExtentY() / 2)));
+        $objWriter->writeAttribute('y', CommonDrawing::pixelsToEmu(round($pNote->getExtentY() / 2) + $pNote->getOffsetY()));
         $objWriter->endElement();
 
         // p:notes/p:cSld/p:spTree/p:sp[2]/p:spPr/a:xfrm/a:ext
@@ -1714,7 +1714,7 @@ protected function writeNote(Note $pNote)
      * @param XMLWriter $objWriter
      * @param Transition $transition
      */
-    public function writeTransition(XMLWriter $objWriter, Transition $transition)
+    protected function writeTransition(XMLWriter $objWriter, Transition $transition)
     {
         $objWriter->startElement('p:transition');
         if (!is_null($transition->getSpeed())) {