fixed bug #5 (contributed by my2iu)

monperrus · Jun 19, 2013 · 310e165 · 310e165
1 parent 725be32
commit 310e165
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/README b/README
@@ -3,7 +3,7 @@ It is a fork of an excellent macro written by Matthew Neeley (see <https://markma
 
 The extension adds a menu entry "Tools>>Add-ons>>Expand animations" in Impress. The generated PDF file is in the same folder as the source document.
 
-Download: <https://raw.github.com/monperrus/ExpandAnimations/master/dist/ExpandAnimations-0.2.oxt> (open this file with LibreOffice)
+Download: <https://raw.github.com/monperrus/ExpandAnimations/master/dist/ExpandAnimations-0.3.oxt> (open this file with LibreOffice)
 
 Issue tracker: <https://github.com/monperrus/ExpandAnimations/issues>
 

diff --git a/dist/ExpandAnimations-0.3.oxt b/dist/ExpandAnimations-0.3.oxt
diff --git a/extension/ExpandAnimations/ExpandAnimations.xba b/extension/ExpandAnimations/ExpandAnimations.xba
@@ -190,12 +190,14 @@ function getAnimatedShapes(slide as Object)
                         if (IsUnoStruct(target)) then
                            target = target.Shape
                         end if
-                        &#39; if we haven&#39;t seen this shape yet, add it to the array
-                        if not containsObject(shapes, target) then
+                        if not IsEmpty(target) then 
+                          &#39; if we haven&#39;t seen this shape yet, add it to the array
+                          if not containsObject(shapes, target) then
                             newUBound = UBound(shapes) + 1
                             reDim preserve shapes(newUBound)
                             shapes(newUBound) = target
-                         end if
+                          end if
+                        end if
                      end if
                  wend
             wend

diff --git a/extension/description.xml b/extension/description.xml
@@ -5,7 +5,7 @@
  xmlns:xlink="https://www.w3.org/1999/xlink">
 	<identifier value="vnd.basicaddonbuilder.expandanimations"/>
 
-	<version value="0.2"/>
+	<version value="0.3"/>
 	<!-- <dependencies>
 		<OpenOffice.org-minimal-version value="2.1" dep:name="OpenOffice.org 2.1"/>
 	</dependencies> -->

diff --git a/extension/pkg-desc/pkg-description.txt b/extension/pkg-desc/pkg-description.txt
@@ -2,7 +2,7 @@ In Impress, enables to expand "appear" animations and to export to PDF (Tools>>A
 
 Issue tracker: https://github.com/monperrus/ExpandAnimations/issues
 
-Copyright (c) 2011  Matthew Neeley, Martin Monperrus
+Copyright (c) 2011-2013  Matthew Neeley, Martin Monperrus
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
 the Free Software Foundation, either version 3 of the License, or

diff --git a/src/ExpandAnimations.bas b/src/ExpandAnimations.bas
@@ -187,12 +187,14 @@ function getAnimatedShapes(slide as Object)
                         if (IsUnoStruct(target)) then
                            target = target.Shape
                         end if
-                        ' if we haven't seen this shape yet, add it to the array
-                        if not containsObject(shapes, target) then
+                        if not IsEmpty(target) then 
+                          ' if we haven't seen this shape yet, add it to the array
+                          if not containsObject(shapes, target) then
                             newUBound = UBound(shapes) + 1
                             reDim preserve shapes(newUBound)
                             shapes(newUBound) = target
-                         end if
+                          end if
+                        end if
                      end if
                  wend
             wend