[Libreoffice-commits] .: automation/source extensions/source

[Tor Lillqvist]

 automation/source/testtool/registry_win.cxx         |    1 -
 extensions/source/plugin/inc/plugin/win/sysplug.hxx |    4 ----
 extensions/source/plugin/win/sysplug.cxx            |   15 +++++----------
 extensions/source/plugin/win/winmgr.cxx             |   15 +++++----------
 4 files changed, 10 insertions(+), 25 deletions(-)

New commits:
commit 933fcb29202c184c58fdeac57f7998f7725a5e9c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Feb 9 00:54:37 2011 +0200

    prewin.h already includes <windows.h>

diff --git a/automation/source/testtool/registry_win.cxx b/automation/source/testtool/registry_win.cxx
index 9e5d9ac..558907e 100644
--- a/automation/source/testtool/registry_win.cxx
+++ b/automation/source/testtool/registry_win.cxx
@@ -37,7 +37,6 @@
 
 
 #include <prewin.h>
-#include "winreg.h"
 #include <postwin.h>
 // as we define it ourselves further down the line we remove it here
 #ifdef IS_ERROR
diff --git a/extensions/source/plugin/inc/plugin/win/sysplug.hxx b/extensions/source/plugin/inc/plugin/win/sysplug.hxx
index 03b6cd0..bf62b4f 100644
--- a/extensions/source/plugin/inc/plugin/win/sysplug.hxx
+++ b/extensions/source/plugin/inc/plugin/win/sysplug.hxx
@@ -33,11 +33,7 @@
 #pragma warning (disable:4005)
 
 #include <prewin.h>
-
-#include <windows.h>
 #include <tchar.h>
-#include <winbase.h>
-
 #include <postwin.h>
 
 #pragma pack( push, 8 )
diff --git a/extensions/source/plugin/win/sysplug.cxx b/extensions/source/plugin/win/sysplug.cxx
index 4566566..928365b 100644
--- a/extensions/source/plugin/win/sysplug.cxx
+++ b/extensions/source/plugin/win/sysplug.cxx
@@ -34,16 +34,11 @@
 #pragma warning (push,1)
 #pragma warning (disable:4005)
 
-    #include <prewin.h>
-
-    #include <windows.h>
-    #include <string.h>
-    #include <tchar.h>
-    #include <winreg.h>
-    #include <winbase.h>
-    #include <objbase.h>
-
-    #include <postwin.h>
+#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 7f95629..e94394f 100644
--- a/extensions/source/plugin/win/winmgr.cxx
+++ b/extensions/source/plugin/win/winmgr.cxx
@@ -43,16 +43,11 @@
 #pragma warning (push,1)
 #pragma warning (disable:4005)
 
-    #include "prewin.h"
-
-    #include <windows.h>
-    #include <string.h>
-    #include <tchar.h>
-    #include <winreg.h>
-    #include <winbase.h>
-    #include <objbase.h>
-
-    #include "postwin.h"
+#include <prewin.h>
+#include <string.h>
+#include <tchar.h>
+#include <objbase.h>
+#include <postwin.h>
 
 #pragma warning (pop)