rpms/openoffice.org/devel openoffice.org-2.2.0.ooo68717.gstreamer.video.patch, 1.7.2.3, 1.7.2.4

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv566

Modified Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org-2.2.0.ooo68717.gstreamer.video.patch 
Log Message:
need to add a header

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.7.2.3
retrieving revision 1.7.2.4
diff -u -r1.7.2.3 -r1.7.2.4
--- openoffice.org-2.2.0.ooo68717.gstreamer.video.patch	12 Mar 2008 17:43:25 -0000	1.7.2.3
+++ openoffice.org-2.2.0.ooo68717.gstreamer.video.patch	13 Mar 2008 09:23:33 -0000	1.7.2.4
@@ -327,7 +327,15 @@
 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
-@@ -159,7 +170,11 @@
+@@ -48,6 +48,7 @@
+ #include <vcl/window.hxx>
+ #include <vcl/javachild.hxx>
+ #include <vcl/salbtype.hxx>
++#include <vcl/sysdata.hxx>
+ 
+ #include <basegfx/tools/canvastools.hxx>
+ #include <basegfx/numeric/ftools.hxx>
+@@ -152,7 +153,11 @@
  				mxPlayerWindow.clear();
  			}
  
@@ -339,7 +347,7 @@
              			
  			// shutdown player
  			if( mxPlayer.is() )
-@@ -294,7 +309,8 @@
+@@ -287,7 +292,8 @@
  							aDeviceParams[ 0 ] >>= aImplName;
  						
  							if( aImplName.endsWithIgnoreAsciiCaseAsciiL( 
@@ -349,7 +357,7 @@
                              {
  								implInitializeVCLBasedPlayerWindow( rBounds, aDeviceParams );
                              }
-@@ -416,6 +432,7 @@
+@@ -393,6 +399,7 @@
  		bool ViewMediaShape::implInitializeVCLBasedPlayerWindow( const ::basegfx::B2DRectangle&   rBounds,
  																 const uno::Sequence< uno::Any >& rVCLDeviceParams)
  		{
@@ -357,7 +365,7 @@
  			if( !mpMediaWindow.get() && !rBounds.isEmpty() )
  			{
  				try
-@@ -437,28 +454,50 @@
+@@ -414,28 +421,50 @@
  																	
  						if( !rRangePix.isEmpty() )
  						{
@@ -3197,7 +3205,7 @@
      public LocaleCodes (XMultiServiceFactory xmsf) {
          super(xmsf, UNIT_NAME, MODULE_NAME);
 -        allLanguageStrings = getStringList(16299);  // STR_ARR_SVT_LANGUAGE_TABLE from svtools/source/misc/langtab.src
-+        allLanguageStrings = getStringList(16301);  // STR_ARR_SVT_LANGUAGE_TABLE part of SvtLanguageTable from svtools
++        allLanguageStrings = getStringList(16301);  // STR_SVT_JAVAERROR_END part of SvtLanguageTable from svtools
      }
      
      public String getLanguageString(String MSID) {