mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: #i119966# Fixed handling of the "visibility" flag of animations.

Browse Source 
Patch by: Steve Yin
Review by: Andre Fischer
(cherry picked from commit 241c9736944e49308e03b74191524a1b8a5076bb)

Conflicts:
	animations/source/animcore/targetpropertiescreator.cxx

Change-Id: Ic81ff35a5a31ba5239510e85c17bb4a261d57b6a
This commit is contained in:
Andre Fischer
2012-06-15 06:11:45 +00:00
committed by Caolán McNamara
parent 2ce6828bbb
commit edba4119ff
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
animations/source/animcore/targetpropertiescreator.cxx
View File

@@ -267,9 +267,9 @@ namespace animcore
// FALLTHROUGH intended // FALLTHROUGH intended
case animations::AnimationNodeType::AUDIO: case animations::AnimationNodeType::AUDIO:
// FALLTHROUGH intended // FALLTHROUGH intended
default: /*default:
// ignore this node, no valuable content for now. // ignore this node, no valuable content for now.
break; break;*/
case animations::AnimationNodeType::SET: case animations::AnimationNodeType::SET:
{ {
@@ -332,9 +332,9 @@ namespace animcore
// initially. This is currently the only place // initially. This is currently the only place
// where a shape effect influences shape // where a shape effect influences shape
// attributes outside it's effective duration. // attributes outside it's effective duration.
sal_Bool bVisible( sal_False );
if( xAnimateNode->getAttributeName().equalsIgnoreAsciiCase("visibility") ) if( xAnimateNode->getAttributeName().equalsIgnoreAsciiCase("visibility") )
{ {
sal_Bool bVisible( sal_False );
uno::Any aAny( xAnimateNode->getTo() ); uno::Any aAny( xAnimateNode->getTo() );
@@ -360,22 +360,27 @@ namespace animcore
} }
} }
if( bVisible ) /*if( bVisible )
{ {
// target is set to 'visible' at the // target is set to 'visible' at the
// first relevant effect. Thus, target // first relevant effect. Thus, target
// must be initially _hidden_, for the // must be initially _hidden_, for the
// effect to have visible impact. // effect to have visible impact.
*/
}
// target is set the 'visible' value,
// so we should record the opposite value
mrShapeHash.insert( mrShapeHash.insert(
XShapeHash::value_type( XShapeHash::value_type(
aTarget, aTarget,
VectorOfNamedValues( VectorOfNamedValues(
1, 1,
beans::NamedValue( beans::NamedValue(
xAnimateNode->getAttributeName(), //xAnimateNode->getAttributeName(),
uno::makeAny( sal_False ) ) ) ) ); ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("visibility")),
} uno::makeAny( !bVisible ) ) ) ) );
} //}
//}
} }
break; break;
} }