summaryrefslogtreecommitdiff
path: root/animations/source
diff options
context:
space:
mode:
authorAndre Fischer <af@apache.org>2012-06-15 06:11:45 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-05-23 16:24:28 +0100
commitedba4119fffb83d7a001f5a2845d20ce3d6c6a1e (patch)
tree4798297db70eae9bc6c787d4dfb25a25c3a2cefa /animations/source
parent2ce6828bbbf6ba181bb2276adeec279e74151ef6 (diff)
Resolves: #i119966# Fixed handling of the "visibility" flag of animations.
Patch by: Steve Yin Review by: Andre Fischer (cherry picked from commit 241c9736944e49308e03b74191524a1b8a5076bb) Conflicts: animations/source/animcore/targetpropertiescreator.cxx Change-Id: Ic81ff35a5a31ba5239510e85c17bb4a261d57b6a
Diffstat (limited to 'animations/source')
-rw-r--r--animations/source/animcore/targetpropertiescreator.cxx23
1 files changed, 14 insertions, 9 deletions
diff --git a/animations/source/animcore/targetpropertiescreator.cxx b/animations/source/animcore/targetpropertiescreator.cxx
index 9e9fd27c0cb8..d42799f4fc3e 100644
--- a/animations/source/animcore/targetpropertiescreator.cxx
+++ b/animations/source/animcore/targetpropertiescreator.cxx
@@ -267,9 +267,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:
{
@@ -332,9 +332,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().equalsIgnoreAsciiCase("visibility") )
{
- sal_Bool bVisible( sal_False );
uno::Any aAny( xAnimateNode->getTo() );
@@ -360,22 +360,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;
}