rpms/openoffice.org/devel openoffice.org-2.2.0.ooo68717.gstreamer.video.patch, 1.11, 1.12

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26587

Modified Files:
	openoffice.org-2.2.0.ooo68717.gstreamer.video.patch 
Log Message:
adjust patch

openoffice.org-2.2.0.ooo68717.gstreamer.video.patch:

Index: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.0.ooo68717.gstreamer.video.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- openoffice.org-2.2.0.ooo68717.gstreamer.video.patch	1 Sep 2008 12:09:08 -0000	1.11
+++ openoffice.org-2.2.0.ooo68717.gstreamer.video.patch	22 Sep 2008 07:53:57 -0000	1.12
@@ -303,7 +303,7 @@
 diff -rup slideshow-orig/source/engine/viewmediashape.cxx slideshow/source/engine/viewmediashape.cxx
 --- slideshow-orig/source/engine/shapes/viewmediashape.cxx	2006-08-17 16:15:39.000000000 +0200
 +++ slideshow/source/engine/shapes/viewmediashape.cxx	2006-08-17 17:26:09.000000000 +0200
-@@ -48,6 +48,7 @@
+@@ -44,6 +44,7 @@
  #include <vcl/window.hxx>
  #include <vcl/javachild.hxx>
  #include <vcl/salbtype.hxx>
@@ -311,7 +311,7 @@
  
  #include <basegfx/tools/canvastools.hxx>
  #include <basegfx/numeric/ftools.hxx>
-@@ -152,7 +153,11 @@
+@@ -148,7 +149,11 @@
  				mxPlayerWindow.clear();
  			}
  
@@ -323,17 +323,22 @@
              			
  			// shutdown player
  			if( mxPlayer.is() )
-@@ -287,7 +292,8 @@
+@@ -282,8 +287,12 @@
+ 							
  							aDeviceParams[ 0 ] >>= aImplName;
  						
- 							if( aImplName.endsWithIgnoreAsciiCaseAsciiL( 
--                                    RTL_CONSTASCII_STRINGPARAM("VCLCanvas") ))
-+                                    RTL_CONSTASCII_STRINGPARAM("VCLCanvas") ) || aImplName.endsWithIgnoreAsciiCaseAsciiL( 
-+                                    RTL_CONSTASCII_STRINGPARAM("CairoCanvas") ) )
+-							if( aImplName.endsWithIgnoreAsciiCaseAsciiL( 
+-                                    RTL_CONSTASCII_STRINGPARAM("VCL") ))
++							if( 
++                                aImplName.endsWithIgnoreAsciiCaseAsciiL( 
++                                    RTL_CONSTASCII_STRINGPARAM("VCL")) ||
++                                aImplName.endsWithIgnoreAsciiCaseAsciiL( 
++                                    RTL_CONSTASCII_STRINGPARAM("CairoCanvas"))
++                              )
                              {
  								implInitializeVCLBasedPlayerWindow( rBounds, aDeviceParams );
                              }
-@@ -393,6 +399,7 @@
+@@ -389,6 +398,7 @@
  		bool ViewMediaShape::implInitializeVCLBasedPlayerWindow( const ::basegfx::B2DRectangle&   rBounds,
  																 const uno::Sequence< uno::Any >& rVCLDeviceParams)
  		{
@@ -341,7 +346,7 @@
  			if( !mpMediaWindow.get() && !rBounds.isEmpty() )
  			{
  				try
-@@ -414,28 +421,50 @@
+@@ -410,28 +420,50 @@
  																	
  						if( !rRangePix.isEmpty() )
  						{