diff options
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu | 28 | ||||
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/UI/Effects.xcs | 7 | ||||
| -rw-r--r-- | xmloff/source/draw/animationimport.cxx | 10 |
3 files changed, 39 insertions, 6 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu index 8c91b21d2f83..e8f1707948ff 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu @@ -8,7 +8,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: Effects.xcu,v $ - * $Revision: 1.9 $ + * $Revision: 1.9.74.1 $ * * This file is part of OpenOffice.org. * @@ -1231,6 +1231,21 @@ </prop> </node> + <node oor:name="ooo-media-start" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Start media</value> + </prop> + </node> + <node oor:name="ooo-media-stop" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">End media</value> + </prop> + </node> + <node oor:name="ooo-media-toggle-pause" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Toggle pause</value> + </prop> + </node> </node> <node oor:name="Properties"> <node oor:name="basic" oor:op="replace"> @@ -2053,6 +2068,15 @@ </prop> </node> </node> + <node oor:name="Misc"> + <node oor:name="media" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Media</value> + </prop> + <prop oor:name="Effects" oor:type="oor:string-list"> + <value oor:separator=";">ooo-media-start;ooo-media-toggle-pause;ooo-media-stop</value> + </prop> + </node> + </node> </node> </oor:component-data> - diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Effects.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Effects.xcs index db7626af0973..90c9a9885f10 100644 --- a/officecfg/registry/schema/org/openoffice/Office/UI/Effects.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/UI/Effects.xcs @@ -8,7 +8,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: Effects.xcs,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.74.1 $ * * This file is part of OpenOffice.org. * @@ -106,6 +106,11 @@ <desc>Contains the categories for motion path effects."</desc> </info> </set> + <set oor:name="Misc" oor:node-type="PresetCategory"> + <info> + <desc>Contains all the categories that don't fit anywhere else."</desc> + </info> + </set> </group> </component> </oor:component-schema> diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx index 71dc9bfcedef..c6a8ce2eb7cc 100644 --- a/xmloff/source/draw/animationimport.cxx +++ b/xmloff/source/draw/animationimport.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: animationimport.cxx,v $ - * $Revision: 1.15 $ + * $Revision: 1.15.62.1 $ * * This file is part of OpenOffice.org. * @@ -804,6 +804,7 @@ void AnimationNodeContext::init_node( const ::com::sun::star::uno::Reference< : // query for optional interfaces that are often used later Reference< XAnimate > xAnimate( mxNode, UNO_QUERY ); + Reference< XCommand > xCommand( mxNode, UNO_QUERY ); Reference< XTransitionFilter > xTransitionFilter( mxNode, UNO_QUERY ); Reference< XIterateContainer > xIter( mxNode, UNO_QUERY ); @@ -950,6 +951,10 @@ void AnimationNodeContext::init_node( const ::com::sun::star::uno::Reference< : { xIter->setTarget( aTarget ); } + else if( xCommand.is() ) + { + xCommand->setTarget( aTarget ); + } } } break; @@ -1230,11 +1235,10 @@ void AnimationNodeContext::init_node( const ::com::sun::star::uno::Reference< : case ANA_Command: { - if( nNodeType == AnimationNodeType::COMMAND ) + if( xCommand.is() && nNodeType == AnimationNodeType::COMMAND ) { if( SvXMLUnitConverter::convertEnum( nEnum, rValue, getAnimationsEnumMap(Animations_EnumMap_Command) ) ) { - Reference< XCommand > xCommand( mxNode, UNO_QUERY_THROW ); xCommand->setCommand( (sal_Int16)nEnum ); } } |