svn commit: r1350481 - /incubator/ooo/trunk/main/animations/source/animcore/targetpropertiescreator.cxx

[af...@apache.org]

Author: af
Date: Fri Jun 15 07:11:45 2012
New Revision: 1350481

URL: http://svn.apache.org/viewvc?rev=1350481&view=rev
Log:
#i119966# Fixed the handling of the "visibility" flag of animations.

          Patch by: Steve Yin
          Review by: Andre Fischer

Modified:
    incubator/ooo/trunk/main/animations/source/animcore/targetpropertiescreator.cxx

Modified: incubator/ooo/trunk/main/animations/source/animcore/targetpropertiescreator.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/animations/source/animcore/targetpropertiescreator.cxx?rev=1350481&r1=1350480&r2=1350481&view=diff
==============================================================================
--- incubator/ooo/trunk/main/animations/source/animcore/targetpropertiescreator.cxx (original)
+++ incubator/ooo/trunk/main/animations/source/animcore/targetpropertiescreator.cxx Fri Jun 15 07:11:45 2012
@@ -276,9 +276,9 @@ namespace animcore
                         // FALLTHROUGH intended
                     case animations::AnimationNodeType::AUDIO:
                         // FALLTHROUGH intended
-                    default:
+                    /*default:
                         // ignore this node, no valuable content for now.
-                        break;
+                        break;*/
 
                     case animations::AnimationNodeType::SET:
                     {
@@ -343,9 +343,9 @@ namespace animcore
                         // initially. This is currently the only place
                         // where a shape effect influences shape
                         // attributes outside it's effective duration.
+			sal_Bool bVisible( sal_False );
                         if( xAnimateNode->getAttributeName().equalsIgnoreAsciiCaseAscii("visibility") )
                         {
-                            sal_Bool bVisible( sal_False );
 
                             uno::Any aAny( xAnimateNode->getTo() );
 
@@ -371,22 +371,27 @@ namespace animcore
                                 }
                             }
 
-                            if( bVisible )
+                            /*if( bVisible )
                             {
                                 // target is set to 'visible' at the
                                 // first relevant effect. Thus, target
                                 // must be initially _hidden_, for the
                                 // effect to have visible impact.
-                                mrShapeHash.insert( 
+                                */
+				}
+						    // target is set the 'visible' value,
+							// so we should record the opposite value
+				mrShapeHash.insert( 
                                     XShapeHash::value_type( 
                                         aTarget,
                                         VectorOfNamedValues( 
                                             1,
                                             beans::NamedValue(
-                                                xAnimateNode->getAttributeName(),
-                                                uno::makeAny( sal_False ) ) ) ) );
-                            }
-                        }
+                                                //xAnimateNode->getAttributeName(),
+						::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("visibility")),
+                                                uno::makeAny( !bVisible ) ) ) ) );
+                            //}
+                        //}
                     }
                     break;
                 }