Skip to content

Commit

Permalink
#63 : Added support for notes slide (ODPresentation & PowerPoint2007)…
Browse files Browse the repository at this point in the history
… (PHPCS Fixes)
  • Loading branch information
Progi1984 committed Jan 7, 2015
1 parent 5e5bdeb commit e7a5222
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 16 deletions.
2 changes: 1 addition & 1 deletion src/PhpPowerpoint/Reader/PowerPoint97.php
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@ private function loadUserEditAtom()
}

/**
* PersistDirectoryAtom
* PersistDirectoryAtom
* @link http://msdn.microsoft.com/en-us/library/dd952680(v=office.12).aspx
* @throws \Exception
*/
Expand Down
2 changes: 1 addition & 1 deletion src/PhpPowerpoint/Slide.php
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ public function getNote()
* @param \PhpOffice\PhpPowerpoint\Slide\Note $note
* @return \PhpOffice\PhpPowerpoint\Slide
*/
public function setNote (Note $note = null)
public function setNote(Note $note = null)
{
$this->slideNote = (is_null($note) ? new Note() : $note);
$this->slideNote->setParent($this);
Expand Down
8 changes: 4 additions & 4 deletions src/PhpPowerpoint/Slide/Note.php
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ public function setParent(Slide $parent)
*
* @return int
*/
public function getOffsetX ()
public function getOffsetX()
{
if ($this->offsetX === null) {
$offsets = GeometryCalculator::calculateOffsets($this);
Expand All @@ -181,7 +181,7 @@ public function getOffsetX ()
*
* @return int
*/
public function getOffsetY ()
public function getOffsetY()
{
if ($this->offsetY === null) {
$offsets = GeometryCalculator::calculateOffsets($this);
Expand All @@ -196,7 +196,7 @@ public function getOffsetY ()
*
* @return int
*/
public function getExtentX ()
public function getExtentX()
{
if ($this->extentX === null) {
$extents = GeometryCalculator::calculateExtents($this);
Expand All @@ -211,7 +211,7 @@ public function getExtentX ()
*
* @return int
*/
public function getExtentY ()
public function getExtentY()
{
if ($this->extentY === null) {
$extents = GeometryCalculator::calculateExtents($this);
Expand Down
1 change: 0 additions & 1 deletion src/PhpPowerpoint/Writer/ODPresentation/Content.php
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,6 @@ public function writeShapeTxt(XMLWriter $objWriter, RichText $shape)
}

/**
*
* @param XMLWriter $objWriter
* @param Line $shape
*/
Expand Down
1 change: 0 additions & 1 deletion src/PhpPowerpoint/Writer/PowerPoint2007/Rels.php
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,6 @@ public function writeSlideRelationships(SlideElement $pSlide)
}

if ($iterator->current() instanceof Group) {

$iterator2 = $pSlide->getShapeCollection()->getIterator();
while ($iterator2->valid()) {
// Hyperlink on shape
Expand Down
10 changes: 5 additions & 5 deletions src/PhpPowerpoint/Writer/Serialized.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class Serialized implements WriterInterface
*
* @param \PhpOffice\PhpPowerpoint\PhpPowerpoint $pPHPPowerPoint
*/
public function __construct (PhpPowerpoint $pPHPPowerPoint = null)
public function __construct(PhpPowerpoint $pPHPPowerPoint = null)
{
// Assign PHPPowerPoint
$this->setPHPPowerPoint($pPHPPowerPoint);
Expand All @@ -50,7 +50,7 @@ public function __construct (PhpPowerpoint $pPHPPowerPoint = null)
* @param string $pFilename
* @throws \Exception
*/
public function save ($pFilename)
public function save($pFilename)
{
if (empty($pFilename)) {
throw new \Exception("Filename is empty.");
Expand Down Expand Up @@ -95,7 +95,7 @@ public function save ($pFilename)
* @return PHPPowerPoint
* @throws \Exception
*/
public function getPHPPowerPoint ()
public function getPHPPowerPoint()
{
if (!is_null($this->presentation)) {
return $this->presentation;
Expand All @@ -111,7 +111,7 @@ public function getPHPPowerPoint ()
* @throws \Exception
* @return \PhpOffice\PhpPowerpoint\Writer\Serialized
*/
public function setPHPPowerPoint (PhpPowerpoint $pPHPPowerPoint = null)
public function setPHPPowerPoint(PhpPowerpoint $pPHPPowerPoint = null)
{
$this->presentation = $pPHPPowerPoint;

Expand All @@ -126,7 +126,7 @@ public function setPHPPowerPoint (PhpPowerpoint $pPHPPowerPoint = null)
* @return string XML Output
* @throws \Exception
*/
private function writeSerialized (PhpPowerpoint $pPHPPowerPoint = null, $pFilename = '')
private function writeSerialized(PhpPowerpoint $pPHPPowerPoint = null, $pFilename = '')
{
// Clone $pPHPPowerPoint
$pPHPPowerPoint = clone $pPHPPowerPoint;
Expand Down
2 changes: 1 addition & 1 deletion tests/PhpPowerpoint/Tests/Reader/PowerPoint97Test.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public function testLoadFileNotExists()

/**
* @expectedException \Exception
* @expectedExceptionMessage Invalid file format for PhpOffice\PhpPowerpoint\Reader\Serialized:
* @expectedExceptionMessage Invalid file format for PhpOffice\PhpPowerpoint\Reader\Serialized:
*/
public function testLoadFileBadFormat()
{
Expand Down
2 changes: 1 addition & 1 deletion tests/PhpPowerpoint/Tests/Reader/SerializedTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public function testLoadFileNotExists()

/**
* @expectedException \Exception
* @expectedExceptionMessage Invalid file format for PhpOffice\PhpPowerpoint\Reader\Serialized:
* @expectedExceptionMessage Invalid file format for PhpOffice\PhpPowerpoint\Reader\Serialized:
*/
public function testLoadFileBadFormat()
{
Expand Down
2 changes: 1 addition & 1 deletion tests/PhpPowerpoint/Tests/Writer/SerializedTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public function testSave()

/**
* @expectedException \Exception
* @expectedExceptionMessage Could not open
* @expectedExceptionMessage Could not open
*/
public function testSaveNotExistingDir()
{
Expand Down

0 comments on commit e7a5222

Please sign in to comment.