fixed bug related to UNO shape objects

error description (From Philip): The error arises because the code expects all animation targets to be UNO shape objects (e.g. SvxShapeText), but animating a text box (even a single-paragraph text box) creates a UNO struct of type com.sun.star.presentation.ParagraphTarget.
monperrus · Jan 31, 2013 · cf23f01 · cf23f01
1 parent 3a911b4
commit cf23f01
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/ExpandAnimations.bas b/src/ExpandAnimations.bas
@@ -183,6 +183,10 @@ function getAnimatedShapes(slide as Object)
                     animNode = animNodes.nextElement()
                     if isVisibilityAnimation(animNode) then
                         target = animNode.target
+                        'special handling for com.sun.star.presentation.ParagraphTarget
+                        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
                             newUBound = UBound(shapes) + 1
@@ -233,6 +237,10 @@ function getShapeVisibility(slide as Object, nFrames as Integer)
                              animNode = animNodes.nextElement()
                              if isVisibilityAnimation(animNode) then
                                 target = animNode.target
+                                'special handling for com.sun.star.presentation.ParagraphTarget
+                                if (IsUnoStruct(target)) then
+                                   target = target.Shape
+                                end if
                                 ' if this is the shape we want, check the visibility
                                 if EqualUnoObjects(shape, target) then
                                     visCurrent = animNode.To