ooo-build r13159 - in trunk: . patches/dev300

[brosenk svn gnome org]

Author: brosenk
Date: Fri Jul 11 14:37:29 2008
New Revision: 13159
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13159&view=rev

Log:
m22 build fixes


Added:
   trunk/patches/dev300/basic-add-missing-includes-after-cws-npower10.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/transogl-more-transitions.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Jul 11 14:37:29 2008
@@ -312,6 +312,8 @@
 #basic runtime fixes
 [ CWSBackports >= dev300-m22 < beb300-m0 ]
 cws-npower10.diff
+basic-add-missing-includes-after-cws-npower10.diff
+
 [ CWSBackports < dev300-m22 >= beb300-m1 ]
 cws-npower10-m21.diff
 [ CWSBackports ]
@@ -330,7 +332,6 @@
 
 cws-impress146.diff
 
-
 [ WPG ]
 # libwpg-based import filter for WordPerfect Graphics
 libwpg.diff

Added: trunk/patches/dev300/basic-add-missing-includes-after-cws-npower10.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/basic-add-missing-includes-after-cws-npower10.diff	Fri Jul 11 14:37:29 2008
@@ -0,0 +1,19 @@
+--- basic/source/runtime/methods.cxx.ark	2008-07-11 12:16:19.216882727 +0200
++++ basic/source/runtime/methods.cxx	2008-07-11 13:22:14.260948113 +0200
+@@ -51,6 +51,7 @@
+ #include <unotools/ucbstreamhelper.hxx>
+ #include <tools/wldcrd.hxx>
+ #include <i18npool/lang.h>
++#include <rtl/string.hxx>
+ 
+ #include "runtime.hxx"
+ #include "sbunoobj.hxx"
+@@ -123,6 +124,8 @@ using namespace com::sun::star::io;
+ #include <io.h>
+ #endif
+ 
++using namespace rtl;
++
+ static void FilterWhiteSpace( String& rStr )
+ {
+ 	rStr.EraseAllChars( ' ' );

Modified: trunk/patches/dev300/transogl-more-transitions.diff
==============================================================================
--- trunk/patches/dev300/transogl-more-transitions.diff	(original)
+++ trunk/patches/dev300/transogl-more-transitions.diff	Fri Jul 11 14:37:29 2008
@@ -658,13 +658,20 @@
  
  private:
      /** clears all the primitives and operations
-@@ -108,11 +124,27 @@ private:
+@@ -108,11 +124,34 @@ private:
  	/** Whether to reflect slides, the reflection happens on flat surface beneath the slides.
  	 ** Now it only works with slides which keep their rectangular shape together.
  	 */
 -	bool bReflectSlides;
 +	bool mbReflectSlides;
 +
++	/** GLSL objects, shaders and program
++	 */
++	GLuint mVertexObject, mFragmentObject, mProgramObject;
++
++	/** various data */
++	GLuint maHelperTexture;
++
 +	/** When this method is not NULL, it is called in display method to prepare the slides, scene, etc.
 +	 ** We might later replace this by cleaner derived class.
 +	 */