[Libreoffice-commits] .: basic/source sfx2/source svx/source

[Fridrich Strba]

 basic/source/runtime/dllmgr-none.cxx |    5 ++++-
 basic/source/runtime/dllmgr-x64.cxx  |    5 ++++-
 basic/source/runtime/dllmgr-x86.cxx  |    5 ++++-
 sfx2/source/appl/impldde.cxx         |    2 +-
 svx/source/dialog/sendreportw32.cxx  |    3 +--
 5 files changed, 14 insertions(+), 6 deletions(-)

New commits:
commit 431ee1380b593011b40f24ddf4e6014eb383ac60
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Sat Mar 26 00:10:08 2011 +0100

    Adapt the tree to tools/svwin.h removal

diff --git a/basic/source/runtime/dllmgr-none.cxx b/basic/source/runtime/dllmgr-none.cxx
index db32b64..e893cd3 100755
--- a/basic/source/runtime/dllmgr-none.cxx
+++ b/basic/source/runtime/dllmgr-none.cxx
@@ -29,6 +29,10 @@
 #include "precompiled_basic.hxx"
 #include "sal/config.h"
 
+#if defined(WNT)
+#include <windows.h>
+#endif
+
 #include <algorithm>
 #include <cstddef>
 #include <list>
@@ -42,7 +46,6 @@
 #include "rtl/string.hxx"
 #include "rtl/ustring.hxx"
 #include "salhelper/simplereferenceobject.hxx"
-#include "tools/svwin.h"
 
 #include "dllmgr.hxx"
 
diff --git a/basic/source/runtime/dllmgr-x64.cxx b/basic/source/runtime/dllmgr-x64.cxx
index 1a5845e..dc774f1 100755
--- a/basic/source/runtime/dllmgr-x64.cxx
+++ b/basic/source/runtime/dllmgr-x64.cxx
@@ -29,6 +29,10 @@
 #include "precompiled_basic.hxx"
 #include "sal/config.h"
 
+#if defined(WNT)
+#include <windows.h>
+#endif
+
 #include <algorithm>
 #include <cstddef>
 #include <list>
@@ -42,7 +46,6 @@
 #include "rtl/string.hxx"
 #include "rtl/ustring.hxx"
 #include "salhelper/simplereferenceobject.hxx"
-#include "tools/svwin.h"
 
 #undef max
 
diff --git a/basic/source/runtime/dllmgr-x86.cxx b/basic/source/runtime/dllmgr-x86.cxx
index 1a417e9..8650a46 100755
--- a/basic/source/runtime/dllmgr-x86.cxx
+++ b/basic/source/runtime/dllmgr-x86.cxx
@@ -29,6 +29,10 @@
 #include "precompiled_basic.hxx"
 #include "sal/config.h"
 
+#if defined(WNT)
+#include <windows.h>
+#endif
+
 #include <algorithm>
 #include <cstddef>
 #include <list>
@@ -43,7 +47,6 @@
 #include "rtl/string.hxx"
 #include "rtl/ustring.hxx"
 #include "salhelper/simplereferenceobject.hxx"
-#include "tools/svwin.h"
 
 #undef max
 
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index 9278d1b..a409dab 100755
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_sfx2.hxx"
 
 #if defined(WNT)
-#include <tools/svwin.h>
+#include <windows.h>
 #endif
 
 #include "impldde.hxx"
diff --git a/svx/source/dialog/sendreportw32.cxx b/svx/source/dialog/sendreportw32.cxx
index 2a80b80..4eaca18 100755
--- a/svx/source/dialog/sendreportw32.cxx
+++ b/svx/source/dialog/sendreportw32.cxx
@@ -33,9 +33,8 @@
 #define UNICODE
 #define _UNICODE
 
-#include <tools/svwin.h>
-
 #define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 #include <tchar.h>
 #include <stdio.h>
 #include <systools/win32/uwinapi.h>