Wholesale prewin.h/postwin.h removal

23 files changed, 4 insertions, 75 deletions

diff --git a/canvas/source/cairo/cairo_cairo.cxx b/canvas/source/cairo/cairo_cairo.cxx
index f4b7803824ff..19a1cad75aa5 100644
--- a/canvas/source/cairo/cairo_cairo.cxx
+++ b/canvas/source/cairo/cairo_cairo.cxx
@@ -32,11 +32,6 @@
 
 #include "cairo_cairo.hxx"
 
-#ifdef WNT
-# include <prewin.h>
-# include <postwin.h>
-#endif
-
 #include <vcl/sysdata.hxx>
 #include <vcl/syschild.hxx>
 
diff --git a/canvas/source/cairo/cairo_canvas.cxx b/canvas/source/cairo/cairo_canvas.cxx
index a3bbd664cfc2..9903dade4863 100644
--- a/canvas/source/cairo/cairo_canvas.cxx
+++ b/canvas/source/cairo/cairo_canvas.cxx
@@ -48,11 +48,6 @@
 #include <basegfx/tools/canvastools.hxx>
 #include <basegfx/numeric/ftools.hxx>
 
-#ifdef WNT
-# include <prewin.h>
-# include <postwin.h>
-#endif
-
 #include <vcl/sysdata.hxx>
 
 #include "cairo_canvas.hxx"
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index f800a541a9b8..9c1501a8245b 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -39,8 +39,6 @@
 #include <vcl/virdev.hxx>
 
 #ifdef WNT
-#include <prewin.h>
-#include <postwin.h>
 #ifdef max
 #undef max
 #endif
diff --git a/canvas/source/cairo/cairo_win32_cairo.cxx b/canvas/source/cairo/cairo_win32_cairo.cxx
index 752e7c74a3f8..e3826f600228 100644
--- a/canvas/source/cairo/cairo_win32_cairo.cxx
+++ b/canvas/source/cairo/cairo_win32_cairo.cxx
@@ -36,9 +36,6 @@
  * Win32 surface backend for OpenOffice.org Cairo Canvas                *
  ************************************************************************/
 
-#include <prewin.h>
-#include <postwin.h>
-
 #include <osl/diagnose.h>
 #include <vcl/bitmap.hxx>
 #include <vcl/virdev.hxx>
diff --git a/canvas/source/cairo/cairo_win32_cairo.hxx b/canvas/source/cairo/cairo_win32_cairo.hxx
index c0db68576ef5..de19aa783396 100644
--- a/canvas/source/cairo/cairo_win32_cairo.hxx
+++ b/canvas/source/cairo/cairo_win32_cairo.hxx
@@ -29,11 +29,6 @@
 #ifndef _CAIROCANVAS_WIN32_CAIRO_HXX
 #define _CAIROCANVAS_WIN32_CAIRO_HXX
 
-#ifdef WNT
-# include <prewin.h>
-# include <postwin.h>
-#endif
-
 #include "cairo_cairo.hxx"
 
 namespace cairo {
diff --git a/l10ntools/source/directory.cxx b/l10ntools/source/directory.cxx
index 05823c74ba14..a4866b5c2db0 100644
--- a/l10ntools/source/directory.cxx
+++ b/l10ntools/source/directory.cxx
@@ -102,8 +102,6 @@ void Directory::readDirectory()
 }
 
 #ifdef WNT
-#include <prewin.h>
-#include <postwin.h>
 
 void Directory::readDirectory ( const rtl::OUString& sFullpath )
 {
diff --git a/l10ntools/source/help/HelpCompiler.cxx b/l10ntools/source/help/HelpCompiler.cxx
index f6995fa309c9..f0e709cccf25 100644
--- a/l10ntools/source/help/HelpCompiler.cxx
+++ b/l10ntools/source/help/HelpCompiler.cxx
@@ -35,10 +35,6 @@
 #include <libxslt/xsltInternals.h>
 #include <libxslt/transform.h>
 #include <libxslt/xsltutils.h>
-#ifdef __MINGW32__
-#include <prewin.h>
-#include <postwin.h>
-#endif
 #include <osl/thread.hxx>
 
 static void impl_sleep( sal_uInt32 nSec )
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 66029f97a691..da3deb586229 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -44,8 +44,6 @@
 #include "rtl/strbuf.hxx"
 #ifdef WNT
 #include <direct.h>
-#include <prewin.h>
-#include <postwin.h>
 #endif
 
 /*****************************************************************************/
diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index b6a539a5db1e..f85bd90df8e2 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -38,10 +38,7 @@
 #include <iostream>
 #include <osl/mutex.hxx>
 #include <osl/thread.hxx>
-#ifdef __MINGW32__
-#include <prewin.h>
-#include <postwin.h>
-#endif
+
 using namespace std;
 using namespace osl;
 
diff --git a/sot/inc/sot/formats.hxx b/sot/inc/sot/formats.hxx
index 595dd09e8cd8..7c2c427fe126 100644
--- a/sot/inc/sot/formats.hxx
+++ b/sot/inc/sot/formats.hxx
@@ -36,9 +36,7 @@
 #pragma warning(push, 1)
 #pragma warning(disable: 4917)
 #endif
-#include <prewin.h>
 #include <shlobj.h>
-#include <postwin.h>
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index aa1fdd0b61a2..201a20ee1e57 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -29,8 +29,6 @@
 #include "precompiled_svl.hxx"
 
 #ifdef WNT
-# include <prewin.h>
-# include <postwin.h>
 # undef ERROR
 #endif
 
diff --git a/svl/source/svdde/ddeimp.hxx b/svl/source/svdde/ddeimp.hxx
index e80470c446c1..6a7ac01ffbef 100644
--- a/svl/source/svdde/ddeimp.hxx
+++ b/svl/source/svdde/ddeimp.hxx
@@ -42,9 +42,7 @@
 
 #else
 
-#include <prewin.h>
 #include <ddeml.h>
-#include <postwin.h>
 #include "ddewrap.hxx"
 
 #endif
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 2adee87e49a3..afe87ca08f01 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -29,7 +29,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 #ifdef WNT
-#include <prewin.h>
 #if defined _MSC_VER
 #pragma warning(push, 1)
 #pragma warning(disable: 4917)
@@ -38,7 +37,6 @@
 #if defined _MSC_VER
 #pragma warning(pop)
 #endif
-#include <postwin.h>
 #endif
 #include <osl/mutex.hxx>
 #include <rtl/memory.h>
diff --git a/toolkit/source/awt/vclxdialog.cxx b/toolkit/source/awt/vclxdialog.cxx
index 066cadc06978..3d301e362b9c 100644
--- a/toolkit/source/awt/vclxdialog.cxx
+++ b/toolkit/source/awt/vclxdialog.cxx
@@ -39,10 +39,7 @@
 #include <toolkit/helper/macros.hxx>
 #include <toolkit/helper/property.hxx>
 
-#ifdef WNT
-#include <prewin.h>
-#include <postwin.h>
-#elif defined ( QUARTZ )
+#ifdef QUARTZ
 #include "premac.h"
 #include <Cocoa/Cocoa.h>
 #include "postmac.h"
diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx
index df1f6d05e14c..7f2721726e9e 100644
--- a/toolkit/source/awt/vclxsystemdependentwindow.cxx
+++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx
@@ -40,10 +40,7 @@
 #include <toolkit/helper/macros.hxx>
 #include <cppuhelper/typeprovider.hxx>
 
-#ifdef WNT
-#include <prewin.h>
-#include <postwin.h>
-#elif defined ( QUARTZ )
+#ifdef QUARTZ
 #include "premac.h"
 #include <Cocoa/Cocoa.h>
 #include "postmac.h"
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 72b9e05688c8..36dda60637d1 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -56,10 +56,7 @@
 #include <rtl/uuid.h>
 #include <rtl/process.h>
 
-#ifdef WNT
-#include <prewin.h>
-#include <postwin.h>
-#elif (defined QUARTZ)
+#ifdef QUARTZ
 #include "premac.h"
 #include <Cocoa/Cocoa.h>
 #include "postmac.h"
diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx
index 7df3d756f95b..94513645bc8f 100644
--- a/toolkit/source/awt/vclxtopwindow.cxx
+++ b/toolkit/source/awt/vclxtopwindow.cxx
@@ -32,9 +32,7 @@
 #include <com/sun/star/awt/SystemDependentXWindow.hpp>
 
 #ifdef WNT
-#include <prewin.h>
 #include <windows.h>
-#include <postwin.h>
 #elif defined ( QUARTZ )
 #include "premac.h"
 #include <Cocoa/Cocoa.h>
diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx
index de6be4c34ef7..c54cc7e551f0 100644
--- a/toolkit/source/awt/vclxwindow1.cxx
+++ b/toolkit/source/awt/vclxwindow1.cxx
@@ -38,8 +38,6 @@
 #include <vcl/window.hxx>
 
 #ifdef WNT
-#include <prewin.h>
-#include <postwin.h>
 #elif defined ( QUARTZ )
 #include "premac.h"
 #include <Cocoa/Cocoa.h>
diff --git a/tools/inc/tools/svwin.h b/tools/inc/tools/svwin.h
index af3476ecfe85..6adc4b8a2c1a 100644
--- a/tools/inc/tools/svwin.h
+++ b/tools/inc/tools/svwin.h
@@ -29,11 +29,6 @@
 #ifndef _SVWIN_H
 #define _SVWIN_H
 
-#if defined WNT
-#include <prewin.h>
-#include <postwin.h>
-#endif
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/qa/test_reversemap.cxx b/tools/qa/test_reversemap.cxx
index fb62eda90d82..e1ea8698ce87 100644
--- a/tools/qa/test_reversemap.cxx
+++ b/tools/qa/test_reversemap.cxx
@@ -26,11 +26,6 @@
  * instead of those above.
  */
 
-#ifdef WNT
-# include <prewin.h>
-# include <postwin.h>
-#endif
-
 #include "precompiled_tools.hxx"
 #include "sal/config.h"
 
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 84b8d7cc9154..782c6d1efc69 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -47,11 +47,6 @@
 #include "unotools/confignode.hxx"
 #include <unotools/syslocaleoptions.hxx>
 
-#ifdef WNT
-#include <prewin.h>
-#include <postwin.h>
-#endif
-
 using ::rtl::OUString;
 // =======================================================================
 
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index cc1ccc45facf..3f7b6a9535dd 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -30,10 +30,8 @@
 #include "precompiled_vcl.hxx"
 
 #ifdef WNT
-#include <prewin.h>
 #include <process.h>    // for _beginthreadex
 #include <ole2.h>   // for _beginthreadex
-#include <postwin.h>
 #endif
 
 // [ed 5/14/02 Add in explicit check for quartz graphics.  OS X will define
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index b6fb1ab26bd2..e2fe11dfc499 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -32,8 +32,6 @@
 #include <string.h>
 #include <malloc.h>
 
-#include <prewin.h>
-#include <postwin.h>
 #include <vcl/sysdata.hxx>
 #include "tools/svwin.h"