[Libreoffice-commits] .: canvas/source l10ntools/source toolkit/source tools/qa vcl/source vcl/win

[Tor Lillqvist]

 canvas/source/cairo/cairo_cairo.cxx              |    1 -
 canvas/source/cairo/cairo_canvas.cxx             |    1 -
 canvas/source/cairo/cairo_textlayout.cxx         |    1 -
 canvas/source/cairo/cairo_win32_cairo.cxx        |    1 -
 canvas/source/cairo/cairo_win32_cairo.hxx        |    1 -
 l10ntools/source/directory.cxx                   |    1 -
 l10ntools/source/helpmerge.cxx                   |    5 ++---
 toolkit/source/awt/vclxdialog.cxx                |    1 -
 toolkit/source/awt/vclxsystemdependentwindow.cxx |    1 -
 toolkit/source/awt/vclxtoolkit.cxx               |    1 -
 toolkit/source/awt/vclxwindow1.cxx               |    1 -
 tools/qa/test_reversemap.cxx                     |    1 -
 vcl/source/app/settings.cxx                      |    5 ++---
 vcl/win/source/gdi/salgdi3.cxx                   |    1 -
 14 files changed, 4 insertions(+), 18 deletions(-)

New commits:
commit b7b10a26601cc83914d15a8703eb923df5084234
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Feb 9 00:57:41 2011 +0200

    prewin.h already includes <windows.h>

diff --git a/canvas/source/cairo/cairo_cairo.cxx b/canvas/source/cairo/cairo_cairo.cxx
index 559afe6..5bd7fc4 100644
--- a/canvas/source/cairo/cairo_cairo.cxx
+++ b/canvas/source/cairo/cairo_cairo.cxx
@@ -34,7 +34,6 @@
 
 #ifdef WNT
 # include <prewin.h>
-# include <windows.h> 
 # include <postwin.h>
 #endif
 
diff --git a/canvas/source/cairo/cairo_canvas.cxx b/canvas/source/cairo/cairo_canvas.cxx
index d80665e..71356a6 100644
--- a/canvas/source/cairo/cairo_canvas.cxx
+++ b/canvas/source/cairo/cairo_canvas.cxx
@@ -50,7 +50,6 @@
 
 #ifdef WNT
 # include <prewin.h>
-# include <windows.h> 
 # include <postwin.h>
 #endif
 
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index 2ab0017..004aa2d 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -40,7 +40,6 @@
 
 #ifdef WNT
 #include <prewin.h>
-#include <windows.h>
 #include <postwin.h>
 #ifdef max
 #undef max
diff --git a/canvas/source/cairo/cairo_win32_cairo.cxx b/canvas/source/cairo/cairo_win32_cairo.cxx
index 55eddd7..992b076 100644
--- a/canvas/source/cairo/cairo_win32_cairo.cxx
+++ b/canvas/source/cairo/cairo_win32_cairo.cxx
@@ -37,7 +37,6 @@
  ************************************************************************/
 
 #include <prewin.h>
-#include <windows.h> 
 #include <postwin.h>
 
 #include <osl/diagnose.h>
diff --git a/canvas/source/cairo/cairo_win32_cairo.hxx b/canvas/source/cairo/cairo_win32_cairo.hxx
index 1a0b2cd..85e36e6 100644
--- a/canvas/source/cairo/cairo_win32_cairo.hxx
+++ b/canvas/source/cairo/cairo_win32_cairo.hxx
@@ -31,7 +31,6 @@
 
 #ifdef WNT
 # include <prewin.h>
-# include <windows.h> 
 # include <postwin.h>
 #endif
 
diff --git a/l10ntools/source/directory.cxx b/l10ntools/source/directory.cxx
index 1e94319..31cb92c 100644
--- a/l10ntools/source/directory.cxx
+++ b/l10ntools/source/directory.cxx
@@ -103,7 +103,6 @@ void Directory::readDirectory()
 
 #ifdef WNT
 #include <prewin.h>
-#include <windows.h>
 #include <postwin.h>
 
 void Directory::readDirectory ( const rtl::OUString& sFullpath )
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index cd3b5cb..99890f8 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -44,9 +44,8 @@
 #include "rtl/strbuf.hxx"
 #ifdef WNT
 #include <direct.h>
-#include "prewin.h"
-#include <windows.h>
-#include "postwin.h"
+#include <prewin.h>
+#include <postwin.h>
 #endif
 
 /*****************************************************************************/
diff --git a/toolkit/source/awt/vclxdialog.cxx b/toolkit/source/awt/vclxdialog.cxx
index 94b2468..5afe8cf 100644
--- a/toolkit/source/awt/vclxdialog.cxx
+++ b/toolkit/source/awt/vclxdialog.cxx
@@ -40,7 +40,6 @@
 
 #ifdef WNT
 #include <prewin.h>
-#include <windows.h>
 #include <postwin.h>
 #elif defined ( QUARTZ )
 #include "premac.h"
diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx
index 8935bde..dce0f8c 100644
--- a/toolkit/source/awt/vclxsystemdependentwindow.cxx
+++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx
@@ -42,7 +42,6 @@
 
 #ifdef WNT
 #include <prewin.h>
-#include <windows.h>
 #include <postwin.h>
 #elif defined ( QUARTZ )
 #include "premac.h"
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 463edf8..71f4b4e 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -54,7 +54,6 @@
 
 #ifdef WNT
 #include <prewin.h>
-#include <windows.h>
 #include <postwin.h>
 #elif (defined QUARTZ)
 #include "premac.h"
diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx
index 78f1259..7ead221 100644
--- a/toolkit/source/awt/vclxwindow1.cxx
+++ b/toolkit/source/awt/vclxwindow1.cxx
@@ -39,7 +39,6 @@
 
 #ifdef WNT
 #include <prewin.h>
-#include <windows.h>
 #include <postwin.h>
 #elif defined ( QUARTZ )
 #include "premac.h"
diff --git a/tools/qa/test_reversemap.cxx b/tools/qa/test_reversemap.cxx
index 47ae96c..193713f 100644
--- a/tools/qa/test_reversemap.cxx
+++ b/tools/qa/test_reversemap.cxx
@@ -28,7 +28,6 @@
 
 #ifdef WNT
 # include <prewin.h>
-# include <windows.h>
 # include <postwin.h>
 #endif
 
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index c23df05..74c2c9a 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -48,9 +48,8 @@
 #include <unotools/syslocaleoptions.hxx>
 
 #ifdef WNT
-#include "prewin.h"
-#include <windows.h>
-#include "postwin.h"
+#include <prewin.h>
+#include <postwin.h>
 #endif
 
 using namespace rtl;
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 02d926e..5b119ea 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -33,7 +33,6 @@
 #include <malloc.h>
 
 #include <prewin.h>
-#include <windows.h>
 #include <postwin.h>
 #include <vcl/sysdata.hxx>
 #include "tools/svwin.h"