[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_sfx2 binfilter/bf_svtools binfilter/bf_xmloff binfilter/inc

[Fridrich Strba]

 binfilter/bf_sc/source/core/tool/sc_token.cxx      |    4 ----
 binfilter/bf_sfx2/source/doc/sfx2_docfilt.cxx      |    3 +--
 binfilter/bf_svtools/source/items1/svt_itemset.cxx |    2 --
 binfilter/bf_xmloff/source/core/xmloff_nmspmap.cxx |    5 -----
 binfilter/inc/bf_svtools/itemset.hxx               |    4 ----
 5 files changed, 1 insertion(+), 17 deletions(-)

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

    Trying to remove the stlport mention from the code

diff --git a/binfilter/bf_sc/source/core/tool/sc_token.cxx b/binfilter/bf_sc/source/core/tool/sc_token.cxx
index 172c067..2508c29 100644
--- a/binfilter/bf_sc/source/core/tool/sc_token.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_token.cxx
@@ -32,11 +32,7 @@
 
 // INCLUDE ---------------------------------------------------------------
 
-#if STLPORT_VERSION<321
-#include <stddef.h>
-#else
 #include <cstddef>
-#endif
 #include <string.h>
 
 #include <tools/debug.hxx>
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docfilt.cxx b/binfilter/bf_sfx2/source/doc/sfx2_docfilt.cxx
index 1b261bb..41af6e0 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_docfilt.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_docfilt.cxx
@@ -29,11 +29,10 @@
 // INCLUDE ---------------------------------------------------------------
 
 #ifdef SOLARIS
-// HACK: prevent conflict between STLPORT and Workshop headers on Solaris 8
 #include <ctime>
 #endif
 
-#include <string> // HACK: prevent conflict between STLPORT and Workshop headers
+#include <string>
 
 
 #ifdef _MSC_VER
diff --git a/binfilter/bf_svtools/source/items1/svt_itemset.cxx b/binfilter/bf_svtools/source/items1/svt_itemset.cxx
index 6cb93cd..1b07bc3 100644
--- a/binfilter/bf_svtools/source/items1/svt_itemset.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_itemset.cxx
@@ -31,9 +31,7 @@
 
 #include <string.h>
 
-#if STLPORT_VERSION>=321
 #include <cstdarg>
-#endif
 
 #define _SVSTDARR_USHORTS
 #define _SVSTDARR_ULONGS
diff --git a/binfilter/bf_xmloff/source/core/xmloff_nmspmap.cxx b/binfilter/bf_xmloff/source/core/xmloff_nmspmap.cxx
index f5605c4..36a850d 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_nmspmap.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_nmspmap.cxx
@@ -81,12 +81,7 @@ SvXMLNamespaceMap::~SvXMLNamespaceMap()
 
 int SvXMLNamespaceMap::operator ==( const SvXMLNamespaceMap& rCmp ) const
 {
-#if STLPORT_VERSION >= 500
-//FIXME: STLport5 alternative map compare?
-    return static_cast < int > (aNameHash.size() == rCmp.aNameHash.size());
-#else
     return static_cast < int > (aNameHash == rCmp.aNameHash);
-#endif
 }
 
 sal_uInt16 SvXMLNamespaceMap::_Add( const OUString& rPrefix, const OUString &rName, sal_uInt16 nKey )
diff --git a/binfilter/inc/bf_svtools/itemset.hxx b/binfilter/inc/bf_svtools/itemset.hxx
index 4ff338a..d2243e7 100644
--- a/binfilter/inc/bf_svtools/itemset.hxx
+++ b/binfilter/inc/bf_svtools/itemset.hxx
@@ -28,11 +28,7 @@
 #ifndef _SFXITEMSET_HXX
 #define _SFXITEMSET_HXX
 
-#if STLPORT_VERSION<321
-#include <stdarg.h>
-#else
 #include <cstdarg> 	// std::va_list and friends
-#endif
 
 #include <bf_svtools/poolitem.hxx>
 #include <tools/rtti.hxx>