diff options
Diffstat (limited to 'animations')
| -rw-r--r-- | animations/inc/animations/animationnodehelper.hxx | 36 | ||||
| -rw-r--r-- | animations/source/animcore/animcore.cxx | 36 | ||||
| -rw-r--r-- | animations/source/animcore/animcore.xml | 22 | ||||
| -rw-r--r-- | animations/source/animcore/factreg.cxx | 4 | ||||
| -rw-r--r-- | animations/source/animcore/factreg.hxx | 4 | ||||
| -rw-r--r-- | animations/source/animcore/targetpropertiescreator.cxx | 80 |
6 files changed, 91 insertions, 91 deletions
diff --git a/animations/inc/animations/animationnodehelper.hxx b/animations/inc/animations/animationnodehelper.hxx index 969e3326105d..c6826d6e38e8 100644 --- a/animations/inc/animations/animationnodehelper.hxx +++ b/animations/inc/animations/animationnodehelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ namespace anim /** Apply given functor to every animation node child. - @param xNode + @param xNode Parent node @param rFunctor @@ -58,23 +58,23 @@ namespace anim @return true, if the functor was successfully applied to all children, false otherwise. */ - template< typename Functor > inline bool for_each_childNode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, - Functor& rFunctor ) + template< typename Functor > inline bool for_each_childNode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, + Functor& rFunctor ) { try { // get an XEnumerationAccess to the children - ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess > - xEnumerationAccess( xNode, + ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess > + xEnumerationAccess( xNode, ::com::sun::star::uno::UNO_QUERY_THROW ); - ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > - xEnumeration( xEnumerationAccess->createEnumeration(), + ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > + xEnumeration( xEnumerationAccess->createEnumeration(), ::com::sun::star::uno::UNO_QUERY_THROW ); - + while( xEnumeration->hasMoreElements() ) { - ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > - xChildNode( xEnumeration->nextElement(), + ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > + xChildNode( xEnumeration->nextElement(), ::com::sun::star::uno::UNO_QUERY_THROW ); rFunctor( xChildNode ); @@ -99,22 +99,22 @@ namespace anim try { // get an XEnumerationAccess to the children - ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess > - xEnumerationAccess( xNode, + ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess > + xEnumerationAccess( xNode, ::com::sun::star::uno::UNO_QUERY ); if( xEnumerationAccess.is() ) { - ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > - xEnumeration( xEnumerationAccess->createEnumeration(), + ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > + xEnumeration( xEnumerationAccess->createEnumeration(), ::com::sun::star::uno::UNO_QUERY ); - + if( xEnumeration.is() ) { while( xEnumeration->hasMoreElements() ) { - ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > - xChildNode( xEnumeration->nextElement(), + ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > + xChildNode( xEnumeration->nextElement(), ::com::sun::star::uno::UNO_QUERY_THROW ); create_deep_vector( xChildNode, rVector ); diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx index 655bc6289fa8..fe90f9109fae 100644 --- a/animations/source/animcore/animcore.cxx +++ b/animations/source/animcore/animcore.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -110,7 +110,7 @@ typedef ::std::list< Reference< XAnimationNode > > ChildList_t; // ==================================================================== -class AnimationNodeBase : public XAnimateMotion, +class AnimationNodeBase : public XAnimateMotion, public XAnimateColor, public XTransitionFilter, public XAnimateSet, @@ -294,7 +294,7 @@ public: void fireChangeListener(); private: - OInterfaceContainerHelper maChangeListener; + OInterfaceContainerHelper maChangeListener; static void initTypeProvider( sal_Int16 nNodeType ) throw(); @@ -312,11 +312,11 @@ private: Sequence< NamedValue > maUserData; // parent interface for XChild interface implementation - Reference<XInterface> mxParent; - AnimationNode* mpParent; + Reference<XInterface> mxParent; + AnimationNode* mpParent; // attributes for XAnimate - Any maTarget; + Any maTarget; OUString maAttributeName, maFormula; Sequence< Any > maValues; Sequence< double > maKeyTimes; @@ -351,10 +351,10 @@ private: // XIterateContainer sal_Int16 mnIterateType; - double mfIterateInterval; + double mfIterateInterval; /** sorted list of child nodes for XTimeContainer*/ - ChildList_t maChilds; + ChildList_t maChilds; }; // ==================================================================== @@ -371,13 +371,13 @@ public: private: /** sorted list of child nodes */ - ChildList_t maChilds; + ChildList_t maChilds; /** current iteration position */ - ChildList_t::iterator maIter; + ChildList_t::iterator maIter; /** our first, last and only protection from mutli-threads! */ - Mutex maMutex; + Mutex maMutex; }; TimeContainerEnumeration::TimeContainerEnumeration( const ChildList_t &rChilds ) @@ -398,7 +398,7 @@ sal_Bool SAL_CALL TimeContainerEnumeration::hasMoreElements() throw (RuntimeExce return maIter != maChilds.end(); } -Any SAL_CALL TimeContainerEnumeration::nextElement() +Any SAL_CALL TimeContainerEnumeration::nextElement() throw (NoSuchElementException, WrappedTargetException, RuntimeException) { Guard< Mutex > aGuard( maMutex ); @@ -415,7 +415,7 @@ Sequence< Type >* AnimationNode::mpTypes[] = { NULL, NULL, NULL, NULL, NULL, NUL Sequence< sal_Int8 >* AnimationNode::mpId[] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; AnimationNode::AnimationNode( sal_Int16 nNodeType ) -: maChangeListener(maMutex), +: maChangeListener(maMutex), mnNodeType( nNodeType ), mnFill( AnimationFill::DEFAULT ), mnFillDefault( AnimationFill::INHERIT ), @@ -446,7 +446,7 @@ AnimationNode::AnimationNode( sal_Int16 nNodeType ) } AnimationNode::AnimationNode( const AnimationNode& rNode ) -: AnimationNodeBase(), +: AnimationNodeBase(), maChangeListener(maMutex), mnNodeType( rNode.mnNodeType ), @@ -493,7 +493,7 @@ AnimationNode::AnimationNode( const AnimationNode& rNode ) // attributes for XAnimateTransform mnTransformType( rNode.mnTransformType ), - + // attributes for XTransitionFilter mnTransition( rNode.mnTransition ), mnSubtype( rNode.mnSubtype ), @@ -647,7 +647,7 @@ void AnimationNode::initTypeProvider( sal_Int16 nNodeType ) throw() mpId[nNodeType] = new Sequence< sal_Int8 >( 16 ); rtl_createUuid( (sal_uInt8 *)mpId[nNodeType]->getArray(), 0, sal_True ); - static sal_Int32 type_numbers[] = + static sal_Int32 type_numbers[] = { 7, // CUSTOM 9, // PAR @@ -1162,7 +1162,7 @@ void SAL_CALL AnimationNode::setParent( const Reference< XInterface >& Parent ) mpParent = 0; Reference< XUnoTunnel > xTunnel( mxParent, UNO_QUERY ); if( xTunnel.is() ) - mpParent = reinterpret_cast< AnimationNode* >( sal::static_int_cast< sal_IntPtr >(xTunnel->getSomething( getUnoTunnelId() ))); + mpParent = reinterpret_cast< AnimationNode* >( sal::static_int_cast< sal_IntPtr >(xTunnel->getSomething( getUnoTunnelId() ))); fireChangeListener(); } @@ -1827,7 +1827,7 @@ Reference< XEnumeration > SAL_CALL AnimationNode::createEnumeration() throw (RuntimeException) { Guard< Mutex > aGuard( maMutex ); - + return new TimeContainerEnumeration( maChilds); } diff --git a/animations/source/animcore/animcore.xml b/animations/source/animcore/animcore.xml index f6d105ea0794..22c3ddda649b 100644 --- a/animations/source/animcore/animcore.xml +++ b/animations/source/animcore/animcore.xml @@ -6,23 +6,23 @@ <component-description> <author> Christian Lippka </author> <name> todo </name> - <description> + <description> This component provides ... </description> - <loader-name> com.sun.star.loader.SharedLibrary </loader-name> - <language> c++ </language> - <status value="draft"/> - <supported-service> </supported-service> + <loader-name> com.sun.star.loader.SharedLibrary </loader-name> + <language> c++ </language> + <status value="draft"/> + <supported-service> </supported-service> <service-dependency> ... </service-dependency> <type> ... </type> </component-description> - <project-build-dependency> cppuhelper </project-build-dependency> - <project-build-dependency> cppu </project-build-dependency> - <project-build-dependency> sal </project-build-dependency> + <project-build-dependency> cppuhelper </project-build-dependency> + <project-build-dependency> cppu </project-build-dependency> + <project-build-dependency> sal </project-build-dependency> - <runtime-module-dependency> cppuhelper </runtime-module-dependency> - <runtime-module-dependency> cppu2 </runtime-module-dependency> - <runtime-module-dependency> sal2 </runtime-module-dependency> + <runtime-module-dependency> cppuhelper </runtime-module-dependency> + <runtime-module-dependency> cppu2 </runtime-module-dependency> + <runtime-module-dependency> sal2 </runtime-module-dependency> </module-description> diff --git a/animations/source/animcore/factreg.cxx b/animations/source/animcore/factreg.cxx index 63c2cacf516b..6bebe98f82a1 100644 --- a/animations/source/animcore/factreg.cxx +++ b/animations/source/animcore/factreg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) { return g_moduleCount.canUnload( &g_moduleCount , pTime ); } - + //================================================================================================== void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) diff --git a/animations/source/animcore/factreg.hxx b/animations/source/animcore/factreg.hxx index c877d1b53c95..c9e0b1ad217f 100644 --- a/animations/source/animcore/factreg.hxx +++ b/animations/source/animcore/factreg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ namespace animcore { extern rtl_StandardModuleCount g_moduleCount; - + #define DECL_NODE_FACTORY(N)\ extern ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance_##N( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rSMgr ) throw (::com::sun::star::uno::Exception);\ extern ::rtl::OUString getImplementationName_##N();\ diff --git a/animations/source/animcore/targetpropertiescreator.cxx b/animations/source/animcore/targetpropertiescreator.cxx index 9386ce316e38..3aaa8b89ea37 100644 --- a/animations/source/animcore/targetpropertiescreator.cxx +++ b/animations/source/animcore/targetpropertiescreator.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -104,7 +104,7 @@ namespace animcore { return TargetPropertiesCreator::createInstance( rSMgr ); } - + ::rtl::OUString getImplementationName_TargetPropertiesCreator() { return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); @@ -123,7 +123,7 @@ namespace animcore { // Vector containing all properties for a given shape typedef ::std::vector< beans::NamedValue > VectorOfNamedValues; - + /** The hash map key This key contains both XShape reference and a paragraph @@ -133,14 +133,14 @@ namespace animcore struct ShapeHashKey { /// Shape target - uno::Reference< drawing::XShape > mxRef; + uno::Reference< drawing::XShape > mxRef; /** Paragraph index. If this is a pure shape target, mnParagraphIndex is set to -1. */ - sal_Int16 mnParagraphIndex; + sal_Int16 mnParagraphIndex; /// Comparison needed for hash_map bool operator==( const ShapeHashKey& rRHS ) const @@ -165,7 +165,7 @@ namespace animcore // x = (x & 0x00F000F0) << 4) | (x >> 4) & 0x00F000F0 | x & 0xF00FF00F; // x = (x & 0x0C0C0C0C) << 2) | (x >> 2) & 0x0C0C0C0C | x & 0xC3C3C3C3; // x = (x & 0x22222222) << 1) | (x >> 1) & 0x22222222 | x & 0x99999999; - // + // // Costs about 17 cycles on a RISC machine with infinite // instruction level parallelism (~42 basic // instructions). Thus I truly doubt this pays off... @@ -183,9 +183,9 @@ namespace animcore { } - NodeFunctor( XShapeHash& rShapeHash, - const uno::Reference< drawing::XShape >& rTargetShape, - sal_Int16 nParagraphIndex ) : + NodeFunctor( XShapeHash& rShapeHash, + const uno::Reference< drawing::XShape >& rTargetShape, + sal_Int16 nParagraphIndex ) : mrShapeHash( rShapeHash ), mxTargetShape( rTargetShape ), mnParagraphIndex( nParagraphIndex ) @@ -202,7 +202,7 @@ namespace animcore } uno::Reference< drawing::XShape > xTargetShape( mxTargetShape ); - sal_Int16 nParagraphIndex( mnParagraphIndex ); + sal_Int16 nParagraphIndex( mnParagraphIndex ); switch( xNode->getType() ) { @@ -222,12 +222,12 @@ namespace animcore "animcore: NodeFunctor::operator(): no target on ITERATE node" ); return; } - + xTargetShape.set( xIterNode->getTarget(), uno::UNO_QUERY ); if( !xTargetShape.is() ) - { + { ::com::sun::star::presentation::ParagraphTarget aTarget; // no shape provided. Maybe a ParagraphTarget? @@ -238,7 +238,7 @@ namespace animcore "target information" ); return; } - + xTargetShape = aTarget.Shape; nParagraphIndex = aTarget.Paragraph; @@ -258,10 +258,10 @@ namespace animcore NodeFunctor aFunctor( mrShapeHash, xTargetShape, nParagraphIndex ); - if( !::anim::for_each_childNode( xNode, + if( !::anim::for_each_childNode( xNode, aFunctor ) ) { - OSL_ENSURE( false, + OSL_ENSURE( false, "AnimCore: NodeFunctor::operator(): child node iteration failed, " "or extraneous container nodes encountered" ); } @@ -289,9 +289,9 @@ namespace animcore case animations::AnimationNodeType::SET: { // evaluate set node content - uno::Reference< animations::XAnimate > xAnimateNode( xNode, + uno::Reference< animations::XAnimate > xAnimateNode( xNode, uno::UNO_QUERY ); - + if( !xAnimateNode.is() ) break; // invalid node @@ -318,26 +318,26 @@ namespace animcore // not a pure shape target - maybe a // ParagraphTarget? presentation::ParagraphTarget aUnoTarget; - + if( !(xAnimateNode->getTarget() >>= aUnoTarget) ) { OSL_ENSURE( false, "AnimCore: NodeFunctor::operator(): unknown target type encountered" ); break; } - + aTarget.mxRef = aUnoTarget.Shape; aTarget.mnParagraphIndex = aUnoTarget.Paragraph; } } - + if( !aTarget.mxRef.is() ) { OSL_ENSURE( false, "AnimCore: NodeFunctor::operator(): Found target, but XShape is NULL" ); break; // invalid target XShape } - + // check whether we already have an entry for // this target (we only take the first set // effect for every shape) @@ -362,7 +362,7 @@ namespace animcore ::rtl::OUString aString; if( (aAny >>= aString) ) { - // we also take the strings "true" and "false", + // we also take the strings "true" and "false", // as well as "on" and "off" here if( aString.equalsIgnoreAsciiCaseAscii("true") || aString.equalsIgnoreAsciiCaseAscii("on") ) @@ -383,10 +383,10 @@ namespace animcore // first relevant effect. Thus, target // must be initially _hidden_, for the // effect to have visible impact. - mrShapeHash.insert( - XShapeHash::value_type( + mrShapeHash.insert( + XShapeHash::value_type( aTarget, - VectorOfNamedValues( + VectorOfNamedValues( 1, beans::NamedValue( xAnimateNode->getAttributeName(), @@ -399,9 +399,9 @@ namespace animcore } private: - XShapeHash& mrShapeHash; - uno::Reference< drawing::XShape > mxTargetShape; - sal_Int16 mnParagraphIndex; + XShapeHash& mrShapeHash; + uno::Reference< drawing::XShape > mxTargetShape; + sal_Int16 mnParagraphIndex; }; } @@ -423,17 +423,17 @@ namespace animcore // XTargetPropertiesCreator uno::Sequence< animations::TargetProperties > SAL_CALL TargetPropertiesCreator::createInitialTargetProperties - ( - const uno::Reference< animations::XAnimationNode >& xRootNode + ( + const uno::Reference< animations::XAnimationNode >& xRootNode ) throw (uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); // scan all nodes for visibility changes, and record first // 'visibility=true' for each shape - XShapeHash aShapeHash( 101, + XShapeHash aShapeHash( 101, &refhasher ); - + NodeFunctor aFunctor( aShapeHash ); // TODO(F1): Maybe limit functor application to main sequence @@ -450,25 +450,25 @@ namespace animcore uno::Sequence< animations::TargetProperties > aRes( aShapeHash.size() ); - ::std::size_t nCurrIndex(0); - XShapeHash::const_iterator aCurr( aShapeHash.begin() ); - const XShapeHash::const_iterator aEnd ( aShapeHash.end() ); + ::std::size_t nCurrIndex(0); + XShapeHash::const_iterator aCurr( aShapeHash.begin() ); + const XShapeHash::const_iterator aEnd ( aShapeHash.end() ); while( aCurr != aEnd ) { animations::TargetProperties& rCurrProps( aRes[ nCurrIndex++ ] ); - if( aCurr->first.mnParagraphIndex == -1 ) - { + if( aCurr->first.mnParagraphIndex == -1 ) + { rCurrProps.Target = uno::makeAny( aCurr->first.mxRef ); } else { - rCurrProps.Target = uno::makeAny( + rCurrProps.Target = uno::makeAny( presentation::ParagraphTarget( aCurr->first.mxRef, aCurr->first.mnParagraphIndex ) ); } - + rCurrProps.Properties = ::comphelper::containerToSequence( aCurr->second ); ++aCurr; @@ -492,7 +492,7 @@ namespace animcore { uno::Sequence< ::rtl::OUString > aRet(1); aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) ); - + return aRet; } |