From 34bda105365cc4c8d9e8fe9c33f3d8b204c4ee79 Mon Sep 17 00:00:00 2001
From: gthomas2 <gthomas@moodlerooms.com>
Date: Tue, 6 Jan 2015 17:20:27 +0000
Subject: [PATCH] Fix images added in word 2011

---
 src/PhpWord/Element/Image.php                | 20 +++++++++++++++++++-
 src/PhpWord/Reader/Word2007/AbstractPart.php |  9 +++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/PhpWord/Element/Image.php b/src/PhpWord/Element/Image.php
index 03637067..0eb3d937 100644
--- a/src/PhpWord/Element/Image.php
+++ b/src/PhpWord/Element/Image.php
@@ -65,6 +65,13 @@ class Image extends AbstractElement
      */
     private $watermark;
 
+    /**
+     * Name of image
+     *
+     * @var string
+     */
+    private $name;
+
     /**
      * Image type
      *
@@ -131,11 +138,12 @@ class Image extends AbstractElement
      * @throws \PhpOffice\PhpWord\Exception\InvalidImageException
      * @throws \PhpOffice\PhpWord\Exception\UnsupportedImageTypeException
      */
-    public function __construct($source, $style = null, $watermark = false)
+    public function __construct($source, $style = null, $watermark = false, $name = null)
     {
         $this->source = $source;
         $this->setIsWatermark($watermark);
         $this->style = $this->setNewStyle(new ImageStyle(), $style, true);
+        $this->name = $name;
 
         $this->checkImage();
     }
@@ -170,6 +178,16 @@ class Image extends AbstractElement
         return $this->sourceType;
     }
 
+    /**
+     * Get image name
+     *
+     * @return null|string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
     /**
      * Get image media ID
      *
diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
index f64886cf..d8155eb5 100644
--- a/src/PhpWord/Reader/Word2007/AbstractPart.php
+++ b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -260,6 +260,15 @@ abstract class AbstractPart
                 }
                 $parent->addImage($imageSource);
             }
+        } elseif ($node->nodeName == 'w:drawing') {
+            // Office 2011 Images
+            $name = $xmlReader->getAttribute('name', $node, 'wp:inline/a:graphic/a:graphicData/pic:pic/pic:nvPicPr/pic:cNvPr');
+            $embedId = $xmlReader->getAttribute('r:embed', $node, 'wp:inline/a:graphic/a:graphicData/pic:pic/pic:blipFill/a:blip');
+            $target = $this->getMediaTarget($docPart, $embedId);
+            if (!is_null($target)) {
+                $imageSource = "zip://{$this->docFile}#{$target}";
+                $parent->addImage($imageSource, null, false, $name);
+            }
         } elseif ($node->nodeName == 'w:object') {
             // Object
             $rId = $xmlReader->getAttribute('r:id', $node, 'o:OLEObject');