[Libreoffice-commits] .: sd/qa sd/source slideshow/test

[Fridrich Strba]

 sd/qa/unit/makefile.mk        |    7 -------
 sd/source/ui/dlg/gluectrl.cxx |    2 +-
 slideshow/test/makefile.mk    |    7 -------
 3 files changed, 1 insertion(+), 15 deletions(-)

New commits:
commit 8e36ef28e449de01484695a1594e17f86cd41e85
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Feb 9 16:20:10 2011 +0100

    Trying to remove the stlport mention from the code

diff --git a/sd/qa/unit/makefile.mk b/sd/qa/unit/makefile.mk
index 0814a35..cf0c35f 100644
--- a/sd/qa/unit/makefile.mk
+++ b/sd/qa/unit/makefile.mk
@@ -35,13 +35,6 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE : settings.mk
 
-#building with stlport, but cppunit was not built with stlport
-.IF "$(USE_SYSTEM_STL)"!="YES"
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGSCXX+=-DADAPT_EXT_STL
-.ENDIF
-.ENDIF
-
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 SHL1TARGET = $(TARGET)
diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx
index 486a1c7..c1cfd09 100644
--- a/sd/source/ui/dlg/gluectrl.cxx
+++ b/sd/source/ui/dlg/gluectrl.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_sd.hxx"
 
 
-#include <string> // HACK: prevent conflict between STLPORT and Workshop headers
+#include <string>
 
 #include <svx/dialogs.hrc>
 #include <svx/svdglue.hxx>
diff --git a/slideshow/test/makefile.mk b/slideshow/test/makefile.mk
index c7f63bb..d5a7089 100644
--- a/slideshow/test/makefile.mk
+++ b/slideshow/test/makefile.mk
@@ -39,13 +39,6 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE :  settings.mk
 .INCLUDE : $(PRJ)$/util$/makefile.pmk
 
-#building with stlport, but cppunit was not built with stlport
-.IF "$(USE_SYSTEM_STL)"!="YES"
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGSCXX+=-DADAPT_EXT_STL
-.ENDIF
-.ENDIF
-
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 # --- Common ----------------------------------------------------------