[Libreoffice-commits] .: canvas/source l10ntools/source sot/inc svl/qa svl/source svtools/source toolkit/source tools/inc tools/qa vcl/source vcl/win
Fridrich Strba
fridrich at kemper.freedesktop.org
Fri Mar 25 11:04:00 PDT 2011
canvas/source/cairo/cairo_cairo.cxx | 5 -----
canvas/source/cairo/cairo_canvas.cxx | 5 -----
canvas/source/cairo/cairo_textlayout.cxx | 2 --
canvas/source/cairo/cairo_win32_cairo.cxx | 3 ---
canvas/source/cairo/cairo_win32_cairo.hxx | 5 -----
l10ntools/source/directory.cxx | 2 --
l10ntools/source/help/HelpCompiler.cxx | 4 ----
l10ntools/source/helpmerge.cxx | 2 --
l10ntools/source/xmlparse.cxx | 5 +----
sot/inc/sot/formats.hxx | 2 --
svl/qa/unit/svl.cxx | 2 --
svl/source/svdde/ddeimp.hxx | 2 --
svtools/source/misc/transfer.cxx | 2 --
toolkit/source/awt/vclxdialog.cxx | 5 +----
toolkit/source/awt/vclxsystemdependentwindow.cxx | 5 +----
toolkit/source/awt/vclxtoolkit.cxx | 5 +----
toolkit/source/awt/vclxtopwindow.cxx | 2 --
toolkit/source/awt/vclxwindow1.cxx | 2 --
tools/inc/tools/svwin.h | 5 -----
tools/qa/test_reversemap.cxx | 5 -----
vcl/source/app/settings.cxx | 5 -----
vcl/source/app/svmain.cxx | 2 --
vcl/win/source/gdi/salgdi3.cxx | 2 --
23 files changed, 4 insertions(+), 75 deletions(-)
New commits:
commit 4bf9eae56c64d0c5198c30993626955b565765bb
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Fri Mar 25 19:03:49 2011 +0100
Wholesale prewin.h/postwin.h removal
diff --git a/canvas/source/cairo/cairo_cairo.cxx b/canvas/source/cairo/cairo_cairo.cxx
index 5bd7fc4..5ec5e63 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 71356a6..fb72180 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 f6c3f9a..8d5e735 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 a192b63..caceb97 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 85e36e6..2ececf3 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 e814f42..6a6a76e 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 e3d5d6d..b53e824 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 c52869e..39e718c 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 677dcac..173595e 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 8532e1d..23afb9b 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 aa1fdd0..201a20e 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 3943736..96c6224 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 29d5469..8c77ef3 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 066cadc..3d301e3 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 dce0f8c..fdcff3b 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 ccf62a0..a763a73 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 084c25c..5e92b39 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 b77fecc..28da272 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 407a4fb..e1d8d55 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 fb62eda..e1ea869 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 0fdbf89..a42115a 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 cc1ccc4..3f7b6a9 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 7f8214f..3b9122d 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"
More information about the Libreoffice-commits
mailing list