From dbfe237fe254bcaecb9bdf6c39e9ec2beac60e93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
Date: Fri, 25 Mar 2011 18:47:00 +0100
Subject: [PATCH] Wholesale prewin.h/postwin.h removal

---
 .../bridge/source/java/WindowsAccessBridgeAdapter.cxx |  2 --
 automation/source/testtool/registry_win.cxx           |  7 -------
 automation/source/testtool/sysdir_win.cxx             |  2 --
 extensions/source/ole/ole2uno.hxx                     |  2 --
 extensions/source/plugin/inc/plugin/win/sysplug.hxx   |  2 --
 extensions/source/plugin/win/sysplug.cxx              |  2 --
 extensions/source/plugin/win/winmgr.cxx               |  2 --
 lingucomponent/source/lingutil/lingutil.cxx           | 11 +----------
 8 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
index 5eea9dd3b337..26925ddcfed8 100644
--- a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
+++ b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
@@ -35,9 +35,7 @@
 
 #include <WindowsAccessBridgeAdapter.h>
 
-#include <prewin.h>
 #include <wtypes.h>
-#include <postwin.h>
 #include <rtl/process.h>
 #include <tools/link.hxx>
 
diff --git a/automation/source/testtool/registry_win.cxx b/automation/source/testtool/registry_win.cxx
index b599342b0854..870f37a53186 100644
--- a/automation/source/testtool/registry_win.cxx
+++ b/automation/source/testtool/registry_win.cxx
@@ -36,13 +36,6 @@
 ////////////////////////////////////////////////////////////////////////////
 
 
-#include <prewin.h>
-#include <postwin.h>
-// as we define it ourselves further down the line we remove it here
-#ifdef IS_ERROR
-//    #undef IS_ERROR
-#endif
-
 #include "registry_win.hxx"
 #include <osl/thread.h>
 #include <sal/macros.h>
diff --git a/automation/source/testtool/sysdir_win.cxx b/automation/source/testtool/sysdir_win.cxx
index 370bac572d82..1ec4ebe02a50 100644
--- a/automation/source/testtool/sysdir_win.cxx
+++ b/automation/source/testtool/sysdir_win.cxx
@@ -36,7 +36,6 @@
 ////////////////////////////////////////////////////////////////////////////
 
 
-#include <prewin.h>
 #ifndef _SHOBJ_H
 #if defined _MSC_VER
 #pragma warning(push, 1)
@@ -47,7 +46,6 @@
 #pragma warning(pop)
 #endif
 #endif
-#include <postwin.h>
 // as we define it ourselves further down the line we remove it here
 #ifdef IS_ERROR
     #undef IS_ERROR
diff --git a/extensions/source/ole/ole2uno.hxx b/extensions/source/ole/ole2uno.hxx
index 55ca3104bd64..2ea46d859de9 100644
--- a/extensions/source/ole/ole2uno.hxx
+++ b/extensions/source/ole/ole2uno.hxx
@@ -49,12 +49,10 @@
 #pragma warning (disable:4005)
 #pragma warning (disable:4548)
 
-#include <prewin.h>
 #include <tchar.h>
 #if (_MSC_VER >= 1200) || defined(__MINGW32__)
 #include <dispex.h>
 #endif
-#include <postwin.h>
 
 #include <tools/presys.h>
 #include <list>
diff --git a/extensions/source/plugin/inc/plugin/win/sysplug.hxx b/extensions/source/plugin/inc/plugin/win/sysplug.hxx
index c90c816e45d3..40ef2e4a8567 100644
--- a/extensions/source/plugin/inc/plugin/win/sysplug.hxx
+++ b/extensions/source/plugin/inc/plugin/win/sysplug.hxx
@@ -32,9 +32,7 @@
 #pragma warning (push,1)
 #pragma warning (disable:4005)
 
-#include <prewin.h>
 #include <tchar.h>
-#include <postwin.h>
 
 #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 a65ff1b5e766..4059f94f3b69 100644
--- a/extensions/source/plugin/win/sysplug.cxx
+++ b/extensions/source/plugin/win/sysplug.cxx
@@ -34,11 +34,9 @@
 #pragma warning (push,1)
 #pragma warning (disable:4005)
 
-#include <prewin.h>
 #include <string.h>
 #include <tchar.h>
 #include <objbase.h>
-#include <postwin.h>
 
 #pragma warning (pop)
 
diff --git a/extensions/source/plugin/win/winmgr.cxx b/extensions/source/plugin/win/winmgr.cxx
index 23aa94464d02..0661bd5b526c 100644
--- a/extensions/source/plugin/win/winmgr.cxx
+++ b/extensions/source/plugin/win/winmgr.cxx
@@ -43,11 +43,9 @@
 #pragma warning (push,1)
 #pragma warning (disable:4005)
 
-#include <prewin.h>
 #include <string.h>
 #include <tchar.h>
 #include <objbase.h>
-#include <postwin.h>
 
 #pragma warning (pop)
 
diff --git a/lingucomponent/source/lingutil/lingutil.cxx b/lingucomponent/source/lingutil/lingutil.cxx
index 989336601761..77fbd3a31595 100755
--- a/lingucomponent/source/lingutil/lingutil.cxx
+++ b/lingucomponent/source/lingutil/lingutil.cxx
@@ -30,18 +30,9 @@
 #include "precompiled_lingucomponent.hxx"
 
 #if defined(WNT)
-#include <prewin.h>
+#include <windows.h>
 #endif
 
-#if defined(WNT)
-#include <Windows.h>
-#endif
-
-#if defined(WNT)
-#include <postwin.h>
-#endif
-
-
 #include <osl/thread.h>
 #include <osl/file.hxx>
 #include <tools/debug.hxx>