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

[brosenk svn gnome org]

Author: brosenk
Date: Mon Jul  7 18:29:21 2008
New Revision: 13096
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13096&view=rev

Log:
m22-ify transogl-transitions-slideshow.diff


Added:
   trunk/patches/dev300/transogl-transitions-slideshow-m21.diff
      - copied unchanged from r13091, /trunk/patches/dev300/transogl-transitions-slideshow.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/transogl-transitions-slideshow.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jul  7 18:29:21 2008
@@ -1697,8 +1697,13 @@
 #debian-gccXXXXX.solenv.javaregistration.diff
 
 
-[ OpenGLTransitions ]
+[ OpenGLTransitions <= dev300-m21 ]
+transogl-transitions-slideshow-m21.diff
+
+[ OpenGLTransitions >= dev300-m22 ]
 transogl-transitions-slideshow.diff
+
+[ OpenGLTransitions ]
 transogl-transitions-sd.diff
 transogl-transitions-officecfg.diff
 transogl-transitions-scp2.diff

Modified: trunk/patches/dev300/transogl-transitions-slideshow.diff
==============================================================================
--- trunk/patches/dev300/transogl-transitions-slideshow.diff	(original)
+++ trunk/patches/dev300/transogl-transitions-slideshow.diff	Mon Jul  7 18:29:21 2008
@@ -1,7 +1,16 @@
-diff -rup slideshow/source/engine/OGLTrans.orig/OGLTrans_TransitionImpl.cxx slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx
---- slideshow/source/engine/OGLTrans.orig/OGLTrans_TransitionImpl.cxx	2007-12-17 17:04:21.000000000 +0100
-+++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx	2007-12-18 12:25:11.000000000 +0100
-@@ -45,6 +45,8 @@ void OGLTransitionImpl::clear()
+--- slideshow/source/engine/OGLTrans/makefile.mk.ogltrss~	2008-06-24 14:05:20.000000000 +0200
++++ slideshow/source/engine/OGLTrans/makefile.mk	2008-07-07 20:21:34.867096734 +0200
+@@ -53,6 +53,7 @@ SLOFILES = \
+         $(SLO)$/OGLTrans_TransitionImpl.obj \
+         $(SLO)$/OGLTrans_TransitionerImpl.obj
+         
++DLLPRE=
+ SHL1TARGET=$(TARGET).uno
+ 
+ .IF "$(GUI)"=="UNX"
+--- slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx.ogltrss~	2008-06-24 14:04:41.000000000 +0200
++++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx	2008-07-07 20:21:34.807096930 +0200
+@@ -42,6 +42,8 @@ void OGLTransitionImpl::clear()
      for(unsigned int i(0); i < maSceneObjects.size(); ++i)
          delete maSceneObjects[i];
      maSceneObjects.clear();
@@ -10,7 +19,7 @@
  }
  
  OGLTransitionImpl::~OGLTransitionImpl()
-@@ -66,6 +68,30 @@ void OGLTransitionImpl::finish()
+@@ -63,6 +65,30 @@ void OGLTransitionImpl::finish()
      }
  }
  
@@ -41,7 +50,7 @@
  void OGLTransitionImpl::display( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex,
                                   double SlideWidth, double SlideHeight, double DispWidth, double DispHeight )
  {
-@@ -75,30 +101,79 @@ void OGLTransitionImpl::display( double 
+@@ -72,30 +98,79 @@ void OGLTransitionImpl::display( double 
      SlideHeightScale = SlideHeight/DispHeight;
  
      glPushMatrix();
@@ -129,7 +138,7 @@
  
      glEnableClientState( GL_VERTEX_ARRAY );
      if(!Normals.empty())
-@@ -113,6 +188,13 @@ void Primitive::display(double nTime, do
+@@ -110,6 +185,13 @@ void Primitive::display(double nTime, do
      glPopMatrix();
  }
  
@@ -143,7 +152,7 @@
  Primitive::~Primitive()
  {
      for(unsigned int i( 0 ); i < Operations.size(); ++i)
-@@ -224,6 +307,8 @@ void OGLTransitionImpl::makeTurnAround()
+@@ -222,6 +304,8 @@ void OGLTransitionImpl::makeTurnAround()
  {
      clear();
      Primitive Slide;
@@ -152,7 +161,7 @@
      
      Slide.pushTriangle(basegfx::B2DVector(0,0),basegfx::B2DVector(1,0),basegfx::B2DVector(0,1));
      Slide.pushTriangle(basegfx::B2DVector(1,0),basegfx::B2DVector(0,1),basegfx::B2DVector(1,1));
-@@ -322,10 +407,12 @@ void OGLTransitionImpl::makeRochade()
+@@ -320,10 +404,12 @@ void OGLTransitionImpl::makeRochade()
      clear();
      Primitive Slide;
      
@@ -166,26 +175,25 @@
  
      Slide.pushTriangle(basegfx::B2DVector(0,0),basegfx::B2DVector(1,0),basegfx::B2DVector(0,1));
      Slide.pushTriangle(basegfx::B2DVector(1,0),basegfx::B2DVector(0,1),basegfx::B2DVector(1,1));
-diff -rup slideshow/source/engine/OGLTrans.orig/OGLTrans_TransitionImpl.hxx slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx
---- slideshow/source/engine/OGLTrans.orig/OGLTrans_TransitionImpl.hxx	2007-12-17 17:04:21.000000000 +0100
-+++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx	2007-12-18 11:05:40.000000000 +0100
-@@ -95,6 +95,15 @@ private:
+--- slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx.ogltrss~	2008-06-24 14:04:52.000000000 +0200
++++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx	2008-07-07 20:23:44.418846399 +0200
+@@ -104,6 +104,15 @@ private:
      /** All the operations that should be applied to both leaving and entering slide primitives. These operations will be called in the order they were pushed back in. In OpenGL this effectively uses the operations in the opposite order they were pushed back.
  	*/
- 	std::vector<Operation*> OverallOperations;
+ 	vector<Operation*> OverallOperations;
 +
-+    /** 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;
-+
-+    void displaySlides( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale );
-+    void displayScene( double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight);
-+    void applyOverallOperations( double nTime, double SlideWidthScale, double SlideHeightScale );
++	/** 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;
++
++	void displaySlides( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale );
++	void displayScene( double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight);
++	void applyOverallOperations( double nTime, double SlideWidthScale, double SlideHeightScale );
  };
  
  class SceneObject
-@@ -138,6 +147,7 @@ public:
+@@ -147,6 +156,7 @@ public:
      Primitive(const Primitive& rvalue);
  	~Primitive();
  
@@ -193,15 +201,3 @@
      void display(double nTime, double SlideWidthScale, double SlideHeightScale);
      const Primitive& operator=(const Primitive& rvalue);
      
-diff --git a/slideshow/source/engine/OGLTrans/makefile.mk b/slideshow/source/engine/OGLTrans/makefile.mk
-index 44de526..73f41cd 100644
---- slideshow/source/engine/OGLTrans/makefile.mk
-+++ slideshow/source/engine/OGLTrans/makefile.mk
-@@ -63,6 +63,7 @@ SLOFILES = \
-         $(SLO)$/OGLTrans_TransitionImpl.obj \
-         $(SLO)$/OGLTrans_TransitionerImpl.obj
-         
-+DLLPRE=
- SHL1TARGET=$(TARGET).uno
- 
- SHL1STDLIBS= $(SALLIB) $(VCLLIB) $(CPPULIB) $(CPPUHELPERLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) -lGL -lGLU -lX11