ooo-build r12465 - in trunk: . patches/gstreamer

[tml svn gnome org]

Author: tml
Date: Mon May  5 06:18:37 2008
New Revision: 12465
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12465&view=rev

Log:
2008-05-05  Tor Lillqvist  <tml novell com>

	* patches/dev300/gstreamer-slideshow.diff
	(slideshow/source/engine/shapes/viewmediashape.cxx): Put the
	#include <vcl/sysdata.hxx> inside #ifdef GSTREAMER,
	too. <vcl/sysdata.hxx> requires <windows.h> on Windows.



Modified:
   trunk/ChangeLog
   trunk/patches/gstreamer/gstreamer-slideshow.diff

Modified: trunk/patches/gstreamer/gstreamer-slideshow.diff
==============================================================================
--- trunk/patches/gstreamer/gstreamer-slideshow.diff	(original)
+++ trunk/patches/gstreamer/gstreamer-slideshow.diff	Mon May  5 06:18:37 2008
@@ -1,12 +1,14 @@
 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 @@
+@@ -48,6 +48,9 @@
  #include <vcl/window.hxx>
  #include <vcl/javachild.hxx>
  #include <vcl/salbtype.hxx>
++#ifdef GSTREAMER
 +#include <vcl/sysdata.hxx>
-
++#endif
+ 
  #include <basegfx/tools/canvastools.hxx>
  #include <basegfx/numeric/ftools.hxx>
 @@ -182,7 +193,11 @@ namespace presentation