Code cleanup

Progi1984 · Progi1984 · commit 60cfde75f4d5 · 2016-05-25T14:45:05.000+02:00
diff --git a/src/PhpPresentation/HashTable.php b/src/PhpPresentation/HashTable.php
@@ -17,8 +17,6 @@
 
 namespace PhpOffice\PhpPresentation;
 
-use PhpOffice\PhpPresentation\ComparableInterface;
-
 /**
  * \PhpOffice\PhpPresentation\HashTable
  */
diff --git a/src/PhpPresentation/Reader/ODPresentation.php b/src/PhpPresentation/Reader/ODPresentation.php
@@ -24,6 +24,7 @@
 use PhpOffice\PhpPresentation\Shape\Drawing\Gd;
 use PhpOffice\PhpPresentation\Shape\RichText;
 use PhpOffice\PhpPresentation\Shape\RichText\Paragraph;
+use PhpOffice\PhpPresentation\Slide\Background\Image;
 use PhpOffice\PhpPresentation\Style\Bullet;
 use PhpOffice\PhpPresentation\Style\Color;
 use PhpOffice\PhpPresentation\Style\Font;
@@ -214,7 +215,7 @@ protected function loadStyle(\DOMElement $nodeStyle)
                     $contentImg = $this->oZip->getFromName($this->arrayCommonStyles[$nameStyle]['path']);
                     file_put_contents($tmpBkgImg, $contentImg);
 
-                    $oBackground = new \PhpOffice\PhpPresentation\Slide\Background\Image();
+                    $oBackground = new Image();
                     $oBackground->setPath($tmpBkgImg);
                 }
             }
diff --git a/src/PhpPresentation/Shape/Chart.php b/src/PhpPresentation/Shape/Chart.php
@@ -17,7 +17,6 @@
 
 namespace PhpOffice\PhpPresentation\Shape;
 
-use PhpOffice\PhpPresentation\AbstractShape;
 use PhpOffice\PhpPresentation\ComparableInterface;
 use PhpOffice\PhpPresentation\Shape\Chart\Legend;
 use PhpOffice\PhpPresentation\Shape\Chart\PlotArea;
diff --git a/src/PhpPresentation/Shape/Chart/Axis.php b/src/PhpPresentation/Shape/Chart/Axis.php
@@ -18,7 +18,6 @@
 namespace PhpOffice\PhpPresentation\Shape\Chart;
 
 use PhpOffice\PhpPresentation\ComparableInterface;
-use PhpOffice\PhpPresentation\Shape\Chart\Gridlines;
 use PhpOffice\PhpPresentation\Style\Font;
 
 /**
diff --git a/src/PhpPresentation/Shape/Chart/Marker.php b/src/PhpPresentation/Shape/Chart/Marker.php
@@ -17,8 +17,6 @@
 
 namespace PhpOffice\PhpPresentation\Shape\Chart;
 
-use PhpOffice\PhpPresentation\ComparableInterface;
-
 /**
  * \PhpOffice\PhpPresentation\Shape\Chart\Axis
  */
diff --git a/src/PhpPresentation/Shape/Drawing/File.php b/src/PhpPresentation/Shape/Drawing/File.php
@@ -2,8 +2,6 @@
 
 namespace PhpOffice\PhpPresentation\Shape\Drawing;
 
-use SplFileInfo;
-
 class File extends AbstractDrawingAdapter
 {
     /**
diff --git a/src/PhpPresentation/Shape/Table.php b/src/PhpPresentation/Shape/Table.php
@@ -17,7 +17,6 @@
 
 namespace PhpOffice\PhpPresentation\Shape;
 
-use PhpOffice\PhpPresentation\AbstractShape;
 use PhpOffice\PhpPresentation\ComparableInterface;
 use PhpOffice\PhpPresentation\Shape\Table\Row;
 
diff --git a/src/PhpPresentation/Writer/ODPresentation.php b/src/PhpPresentation/Writer/ODPresentation.php
@@ -21,7 +21,6 @@
 use PhpOffice\PhpPresentation\HashTable;
 use PhpOffice\PhpPresentation\PhpPresentation;
 use PhpOffice\PhpPresentation\Shape\AbstractDrawing;
-use PhpOffice\PhpPresentation\Shape\Group;
 use PhpOffice\PhpPresentation\Shape\Table;
 use DirectoryIterator;
 
diff --git a/src/PhpPresentation/Writer/PowerPoint2007.php b/src/PhpPresentation/Writer/PowerPoint2007.php
@@ -23,8 +23,6 @@
 use PhpOffice\PhpPresentation\PhpPresentation;
 use PhpOffice\PhpPresentation\Shape\AbstractDrawing;
 use PhpOffice\PhpPresentation\Shape\Chart as ChartShape;
-use PhpOffice\PhpPresentation\Shape\Drawing\AbstractDrawingAdapter;
-use PhpOffice\PhpPresentation\Shape\Group;
 use PhpOffice\PhpPresentation\Shape\Table;
 use PhpOffice\PhpPresentation\Writer\PowerPoint2007\LayoutPack\AbstractLayoutPack;
 use PhpOffice\PhpPresentation\Writer\PowerPoint2007\LayoutPack\PackDefault;
diff --git a/src/PhpPresentation/Writer/PowerPoint2007/PptCharts.php b/src/PhpPresentation/Writer/PowerPoint2007/PptCharts.php
@@ -2006,19 +2006,16 @@ protected function writeAxis(XMLWriter $objWriter, Chart\Axis $oAxis, $typeAxis)
             return;
         }
 
-        switch ($typeAxis) {
-            case Chart\Axis::AXIS_X:
-                $mainElement = 'c:catAx';
-                $axIdVal = '52743552';
-                $axPosVal = 'b';
-                $crossAxVal = '52749440';
-                break;
-            case Chart\Axis::AXIS_Y:
-                $mainElement = 'c:valAx';
-                $axIdVal = '52749440';
-                $axPosVal = 'l';
-                $crossAxVal = '52743552';
-                break;
+        if ($typeAxis == Chart\Axis::AXIS_X) {
+            $mainElement = 'c:catAx';
+            $axIdVal = '52743552';
+            $axPosVal = 'b';
+            $crossAxVal = '52749440';
+        } else {
+            $mainElement = 'c:valAx';
+            $axIdVal = '52749440';
+            $axPosVal = 'l';
+            $crossAxVal = '52743552';
         }
 
         // $mainElement
diff --git a/src/PhpPresentation/Writer/PowerPoint2007/Relationships.php b/src/PhpPresentation/Writer/PowerPoint2007/Relationships.php
@@ -55,9 +55,10 @@ public function writeRelationships()
             if ($gdImage) {
                 imagedestroy($gdImage);
                 // Relationship docProps/thumbnail.jpeg
-                $this->writeRelationship($objWriter, $idxRelation++, 'http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail', 'docProps/thumbnail.jpeg');
+                $this->writeRelationship($objWriter, $idxRelation, 'http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail', 'docProps/thumbnail.jpeg');
             }
         }
+        // ++$idxRelation
 
         $objWriter->endElement();
 

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,6 @@`
`2`	`2`
`3`	`3`	`namespace PhpOffice\PhpPresentation\Shape\Drawing;`
`4`	`4`
`5`		`-use SplFileInfo;`
`6`		`-`
`7`	`5`	`class File extends AbstractDrawingAdapter`
`8`	`6`	`{`
`9`	`7`	`/**`