[Libreoffice-commits] .: sd/workben slideshow/source

[Tor Lillqvist]

 sd/workben/testdll/makefile                                        |   28 ----------
 slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx |    2 
 slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx   |    1 
 3 files changed, 31 deletions(-)

New commits:
commit 883ca553a71056e5c67d745a792cea350e892742
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sat May 21 15:54:49 2011 +0300

    Drop OS2

diff --git a/sd/workben/testdll/makefile b/sd/workben/testdll/makefile
index 51f7a1a..0ba371f 100644
--- a/sd/workben/testdll/makefile
+++ b/sd/workben/testdll/makefile
@@ -71,31 +71,3 @@ $(MISC)\$(SHL1TARGET).def:  makefile
     @echo EXPORTS                                                   >>$@
 	@echo _CreateWindow @2 								>>$@
 !ENDIF
-
-!IF "$(GUI)" == "OS2"
-
-$(MISC)\$(SHL1TARGET).def:  makefile
-	@echo ================================================================
-	@echo building $@
-	@echo ----------------------------------------------------------------
-!IF "$(COM)"!="WTC"
-	echo  LIBRARY		INITINSTANCE TERMINSTANCE			>$@
-	echo  DESCRIPTION	'StarOne Test-DLL'           					>>$@
-	echo  PROTMODE										   >>$@
-    	@echo CODE        LOADONCALL 			              >>$@
-	@echo DATA		  PRELOAD MULTIPLE NONSHARED					  >>$@
-    	@echo EXPORTS                                                   >>$@
-!IF "$(COM)"!="ICC"
-	@echo _CreateWindow @2 								>>$@
-!ELSE
-	@echo CreateWindow @2 								>>$@
-!ENDIF
-
-!ELSE
-    	@echo option DESCRIPTION 'StarOne Test-DLL'		                    >$@
-    	@echo name $(BIN)\$(SHL1TARGET).dll                         >>$@
-	@echo CreateWindow_ @2 								>>$@
-	@gawk -f s:\util\exp.awk temp.def				>>$@
-	del temp.def
-!ENDIF
-!ENDIF
diff --git a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx
index 8d74d80..02a5e25 100644
--- a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx
@@ -63,7 +63,6 @@
 #if defined( WNT )
     #define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE
     #define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
-#elif defined( OS2 )
 #elif defined( QUARTZ )
     #include "premac.h"
     #include <Cocoa/Cocoa.h>
@@ -212,7 +211,6 @@ private:
     HWND					hWnd;
     HDC						hDC;
     HGLRC					hRC;
-#elif defined( OS2 )
 #elif defined( QUARTZ )
 #elif defined( UNX )
     unx::Display*           dpy;
diff --git a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx
index 5f8a903..b67ab88 100644
--- a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx
+++ b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx
@@ -32,7 +32,6 @@
 #include <basegfx/vector/b3dvector.hxx>
 
 #if defined( WNT ) 
-#elif defined( OS2 )
 #elif defined( QUARTZ )
 #include <OpenGL/gl.h>
 #elif defined( UNX ) && !defined( QUARTZ )