rpms/openoffice.org/devel openoffice.org-1.9.118.ooo52061.recursive.animations.patch, 1.1, 1.2

[fedora-cvs-commits redhat com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24985

Modified Files:
	openoffice.org-1.9.118.ooo52061.recursive.animations.patch 
Log Message:
alternative working patch

openoffice.org-1.9.118.ooo52061.recursive.animations.patch:
 animations/inc/animations/animationnodehelper.hxx |    2 +-
 inc/animations/animationnodehelper.hxx            |    0 
 2 files changed, 1 insertion(+), 1 deletion(-)

Index: openoffice.org-1.9.118.ooo52061.recursive.animations.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.118.ooo52061.recursive.animations.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.118.ooo52061.recursive.animations.patch	18 Jul 2005 08:47:53 -0000	1.1
+++ openoffice.org-1.9.118.ooo52061.recursive.animations.patch	18 Jul 2005 11:38:42 -0000	1.2
@@ -4,66 +4,13 @@
 retrieving revision 1.3
 diff -u -p -r1.3 animationnodehelper.hxx
 --- openoffice.org.orig/animations/inc/animations/animationnodehelper.hxx	14 Jul 2005 10:46:18 -0000	1.3
-+++ openoffice.org/animations/inc/animations/animationnodehelper.hxx	18 Jul 2005 08:45:48 -0000
-@@ -131,9 +131,16 @@ namespace anim
-     }
++++ openoffice.org/animations/inc/animations/animationnodehelper.hxx	18 Jul 2005 11:37:56 -0000
+@@ -133,7 +133,7 @@ namespace anim
  
- 
-+	void create_deep_vector( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode,
-+								std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > >& rVector );
-+
-+	void shadow_create_deep_vector( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode,
-+								std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > >& rVector );
-+
-+
  	/** pushes the given node to the given vector and recursivly calls itself for each child node.
  	*/
 -	void create_deep_vector( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode,
-+	void shadow_create_deep_vector( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode,
++	inline void create_deep_vector( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode,
  								std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > >& rVector )
  	{
  		rVector.push_back( xNode );
-@@ -168,6 +175,43 @@ namespace anim
-         {
-         }
- 	}
-+
-+	void create_deep_vector( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode,
-+								std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > >& rVector )
-+	{
-+		rVector.push_back( xNode );
-+
-+        try
-+        {
-+            // get an XEnumerationAccess to the children
-+            ::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::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::UNO_QUERY_THROW );
-+
-+						shadow_create_deep_vector( xChildNode, rVector );
-+					}
-+				}
-+			}
-+        }
-+        catch( ::com::sun::star::uno::Exception& )
-+        {
-+        }
-+	}
-+
- }
- 
- #endif /* INCLUDED_ANIMATIONS_ANIMATIONNODEHELPER_HXX */