[Libreoffice-commits] .: 2 commits - sc/qa sc/source

[Fridrich Strba]

 sc/qa/unit/makefile.mk           |    7 -------
 sc/qa/unit/ucalc.cxx             |    2 --
 sc/source/core/tool/token.cxx    |    4 ----
 sc/source/ui/cctrl/tbinsert.cxx  |    3 +--
 sc/source/ui/docshell/docsh4.cxx |    2 --
 5 files changed, 1 insertion(+), 17 deletions(-)

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

    Trying to remove the stlport mention from the code

diff --git a/sc/qa/unit/makefile.mk b/sc/qa/unit/makefile.mk
index 0020c4d..db06d45 100644
--- a/sc/qa/unit/makefile.mk
+++ b/sc/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/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index b935525..8a14e59 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -33,11 +33,7 @@
 
 // INCLUDE ---------------------------------------------------------------
 
-#if STLPORT_VERSION<321
-#include <stddef.h>
-#else
 #include <cstddef>
-#endif
 #include <cstdio>
 
 #include <string.h>
diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx
index 0bf8987..2008b54 100644
--- a/sc/source/ui/cctrl/tbinsert.cxx
+++ b/sc/source/ui/cctrl/tbinsert.cxx
@@ -31,8 +31,7 @@
 
 // System - Includes -----------------------------------------------------
 
-#include <string> // HACK: prevent conflict between STLPORT and Workshop headers
-
+#include <string>
 
 
 // INCLUDE ---------------------------------------------------------------
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index da42f87..26bf403 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -37,9 +37,7 @@
 using namespace ::com::sun::star;
 
 // INCLUDE ---------------------------------------------------------------
-#if STLPORT_VERSION>=321
 #include <math.h>		// prevent conflict between exception and std::exception
-#endif
 
 #include "scitems.hxx"
 #include <sfx2/fcontnr.hxx>
commit e9a648c0276c0df1a6aba3919a713940eab0f8d4
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Feb 9 10:49:54 2011 +0100

    Removing the ext_std masterpiece

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index a44eea7..6e46569 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -47,12 +47,10 @@
 # undef ERROR
 #endif
 
-#include "preextstl.h"
 #include <cppunit/TestAssert.h>
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/plugin/TestPlugIn.h>
-#include "postextstl.h"
 
 #include <sal/config.h>