stl includes

3 files changed, 26 insertions, 56 deletions

diff --git a/extensions/source/plugin/inc/plugin/win/sysplug.hxx b/extensions/source/plugin/inc/plugin/win/sysplug.hxx
index e1a22c3ba0ce..6aeccf7549c5 100644
--- a/extensions/source/plugin/inc/plugin/win/sysplug.hxx
+++ b/extensions/source/plugin/inc/plugin/win/sysplug.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sysplug.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:16:51 $
+ *  last change: $Author: dbo $ $Date: 2001-02-02 14:37:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,30 +62,17 @@
 #ifndef __PLUGIN_INC_WINPLUG_HXX
 #define __PLUGIN_INC_WINPLUG_HXX
 
-#if _MSC_VER >= 1200
 #include <tools/prewin.h>
-#else
-#include <tools/presys.h>
-#endif
-#if STLPORT_VERSION < 321
-#include <list.h>
-#include <map.h>
-#include <algo.h>
-#include <function.h>
-#endif
+
 #include <windows.h>
 #include <tchar.h>
 #include <winbase.h>
-#if _MSC_VER >= 1200
+
 #include <tools/postwin.h>
-#else
-#include <tools/postsys.h>
-#endif
-#if STLPORT_VERSION >= 321
-#include <stl/list>
-#include <stl/map>
-#include <stl/algorithm>
-#endif
+
+#include <list>
+#include <map>
+#include <algorithm>
 
 #pragma pack( push, 8 )
 #include <npsdk/npapi.h>
diff --git a/extensions/source/plugin/win/sysplug.cxx b/extensions/source/plugin/win/sysplug.cxx
index f0f2dc889aa4..57e537a70625 100644
--- a/extensions/source/plugin/win/sysplug.cxx
+++ b/extensions/source/plugin/win/sysplug.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sysplug.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:16:52 $
+ *  last change: $Author: dbo $ $Date: 2001-02-02 14:37:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,34 +62,25 @@
 #include <plugin/impl.hxx>
 
 #ifdef WNT
-#if _MSC_VER >= 1200
 #include <tools/prewin.h>
-#else
-#include <tools/presys.h>
-#endif
-#endif
-#if STLPORT_VERSION < 321
-#include <stl/map.h>
 #endif
+
 #include <windows.h>
 #include <string.h>
 #include <tchar.h>
 #include <winreg.h>
 #include <winbase.h>
 #include <objbase.h>
+
 #ifdef WNT
-#if _MSC_VER >= 1200
 #include <tools/postwin.h>
-#else
-#include <tools/postsys.h>
-#endif
-#endif
-#if STLPORT_VERSION >= 321
-#include <stl/list>
-#include <stl/map>
-#include <stl/algorithm>
 #endif
 
+#include <list>
+#include <map>
+#include <algorithm>
+
+
 extern NPNetscapeFuncs aNPNFuncs;
 
 #include <tools/debug.hxx>
diff --git a/extensions/source/plugin/win/winmgr.cxx b/extensions/source/plugin/win/winmgr.cxx
index a1a2b6abf44b..bc3e6d1ef1b4 100644
--- a/extensions/source/plugin/win/winmgr.cxx
+++ b/extensions/source/plugin/win/winmgr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: winmgr.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:16:52 $
+ *  last change: $Author: dbo $ $Date: 2001-02-02 14:37:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -70,33 +70,25 @@
 #include <plugin/impl.hxx>
 
 #ifdef WNT
-#if _MSC_VER >= 1200
 #include <tools/prewin.h>
-#else
-#include <tools/presys.h>
-#endif
 #endif
+
 #include <windows.h>
 #include <string.h>
 #include <tchar.h>
 #include <winreg.h>
 #include <winbase.h>
 #include <objbase.h>
+
 #ifdef WNT
-#if _MSC_VER >= 1200
 #include <tools/postwin.h>
-#else
-#include <tools/postsys.h>
-#endif
-#endif
-#if STLPORT_VERSION >= 321
-#include <stl/list>
-#include <stl/map>
-#include <stl/algorithm>
-#else
-#include <stl/map.h>
 #endif
 
+#include <list>
+#include <map>
+#include <algorithm>
+
+
 using namespace rtl;
 using namespace std;
 using namespace osl;