rpms/openoffice.org/devel openoffice.org-1.9.118.ooo52061.recursive.animations.patch, NONE, 1.1 openoffice.org.spec, 1.321, 1.322

[fedora-cvs-commits redhat com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.118.ooo52061.recursive.animations.patch 
Log Message:
recursive templates problem?

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

--- NEW FILE openoffice.org-1.9.118.ooo52061.recursive.animations.patch ---
Index: inc/animations/animationnodehelper.hxx
===================================================================
RCS file: /cvs/graphics/animations/inc/animations/animationnodehelper.hxx,v
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
     }
 
 
+	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,
 								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 */


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -r1.321 -r1.322
--- openoffice.org.spec	17 Jul 2005 17:04:03 -0000	1.321
+++ openoffice.org.spec	18 Jul 2005 08:47:53 -0000	1.322
@@ -163,6 +163,7 @@
 Patch62: openoffice.org-1.9.117.rh150643.fontconfigalwayssystemfont.vcl.patch
 Patch63: openoffice.org-1.9.117.oooXXXXX.mozillanspr.extensions.patch
 Patch64: openoffice.org-1.9.118.forwarddecl.psprint.patch
+Patch65: openoffice.org-1.9.118.ooo52061.recursive.animations.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -812,6 +813,7 @@
 %endif
 %patch63 -p1 -b .oooXXXXX.mozillanspr.extensions.patch
 %patch64 -p1 -b .forwarddecl.psprint.patch
+%patch65 -p1 -b .ooo52061.recursive.animations.patch
 
 %if %{includeexternals}
 #start ludicrous workaround