Adapt the tree to tools/svwin.h removal

24 files changed, 22 insertions, 31 deletions

diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 36dda60637d1..dacd5156d69c 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -33,7 +33,6 @@
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 
-#include <tools/svwin.h>
 #include <stdio.h>
 #include <com/sun/star/awt/ImageScaleMode.hpp>
 #include <com/sun/star/awt/WindowAttribute.hpp>
diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx
index c54cc7e551f0..186b65c3d68f 100644
--- a/toolkit/source/awt/vclxwindow1.cxx
+++ b/toolkit/source/awt/vclxwindow1.cxx
@@ -29,7 +29,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_toolkit.hxx"
 
-#include <tools/svwin.h>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <com/sun/star/beans/NamedValue.hpp>
 #ifndef _SV_WORKWIN
@@ -38,6 +37,7 @@
 #include <vcl/window.hxx>
 
 #ifdef WNT
+#include <windows.h>
 #elif defined ( QUARTZ )
 #include "premac.h"
 #include <Cocoa/Cocoa.h>
diff --git a/toolkit/workben/unodialog.cxx b/toolkit/workben/unodialog.cxx
index d2203bba1384..4652457766c2 100644
--- a/toolkit/workben/unodialog.cxx
+++ b/toolkit/workben/unodialog.cxx
@@ -28,7 +28,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_toolkit.hxx"
-#include <tools/svwin.h>
 #include <sal/main.h>
 #include <com/sun/star/awt/XToolkit.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/vcl/os2/source/gdi/os2layout.cxx b/vcl/os2/source/gdi/os2layout.cxx
index ad38ea658300..a6574c3a2171 100644
--- a/vcl/os2/source/gdi/os2layout.cxx
+++ b/vcl/os2/source/gdi/os2layout.cxx
@@ -26,8 +26,6 @@
  *
  ************************************************************************/
 
-#include <tools/svwin.h>
-
 #include <rtl/ustring.hxx>
 #include <osl/module.h>
 #include <salgdi.h>
diff --git a/vcl/os2/source/gdi/salgdi3.cxx b/vcl/os2/source/gdi/salgdi3.cxx
index f1580fe77185..63fd79b8fa2e 100644
--- a/vcl/os2/source/gdi/salgdi3.cxx
+++ b/vcl/os2/source/gdi/salgdi3.cxx
@@ -36,7 +36,6 @@
 #include <svpm.h>
 
 #define _SV_SALGDI3_CXX
-#include <tools/svwin.h>
 #include <rtl/tencinfo.h>
 #include <osl/file.hxx>
 #include <osl/thread.hxx>
diff --git a/vcl/source/glyphs/graphite_features.cxx b/vcl/source/glyphs/graphite_features.cxx
index c5b578f4cc97..175656e25515 100644
--- a/vcl/source/glyphs/graphite_features.cxx
+++ b/vcl/source/glyphs/graphite_features.cxx
@@ -37,8 +37,7 @@
 #include <sal/types.h>
 
 #ifdef WNT
-#include <tools/svwin.h>
-#include <svsys.h>
+#include <windows.h>
 #endif
 
 #include <vcl/graphite_features.hxx>
diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx
index 76db71bfb0dc..6b72f96e7eb6 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -54,8 +54,7 @@
 
 // Platform
 #ifdef WNT
-#include <tools/svwin.h>
-#include <svsys.h>
+#include <windows.h>
 #endif
 
 #include <vcl/salgdi.hxx>
diff --git a/vcl/source/glyphs/graphite_textsrc.hxx b/vcl/source/glyphs/graphite_textsrc.hxx
index c5ef0ac7b43d..b5251cff2922 100644
--- a/vcl/source/glyphs/graphite_textsrc.hxx
+++ b/vcl/source/glyphs/graphite_textsrc.hxx
@@ -40,9 +40,9 @@
 #include <stdexcept>
 // Platform
 
-#include <tools/svwin.h>
-
-#include <svsys.h>
+#ifdef WNT
+#include <windows.h>
+#endif
 
 #include <vcl/salgdi.hxx>
 
diff --git a/vcl/win/inc/svsys.h b/vcl/win/inc/svsys.h
index a43cbccab541..9826886af7db 100644
--- a/vcl/win/inc/svsys.h
+++ b/vcl/win/inc/svsys.h
@@ -29,8 +29,6 @@
 #ifndef _SV_SVSYS_H
 #define _SV_SVSYS_H
 
-#include <tools/svwin.h>
-
 #endif // _SV_SVSYS_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx
index 374c7b4922b3..a848cab2df0c 100644
--- a/vcl/win/source/app/saldata.cxx
+++ b/vcl/win/source/app/saldata.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include <tools/svwin.h>
+#include <windows.h>
 #include "rtl/tencinfo.h"
 #include <saldata.hxx>
 #include <vcl/svapp.hxx>
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index e0935a6d956a..8362cdead7ad 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -30,8 +30,8 @@
 #include "precompiled_vcl.hxx"
 
 #include <string.h>
-#include <tools/svwin.h>
 #ifdef WNT
+#include <windows.h>
 #include <process.h>
 #endif
 #ifdef __MINGW32__
diff --git a/vcl/win/source/app/salshl.cxx b/vcl/win/source/app/salshl.cxx
index 5dcc4b67da4e..2e5d06be7de9 100644
--- a/vcl/win/source/app/salshl.cxx
+++ b/vcl/win/source/app/salshl.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include <tools/svwin.h>
+#include <windows.h>
 #include <saldata.hxx>
 #include <tools/debug.hxx>
 
diff --git a/vcl/win/source/app/saltimer.cxx b/vcl/win/source/app/saltimer.cxx
index 29caaef3a5c3..81b36c97b4ed 100644
--- a/vcl/win/source/app/saltimer.cxx
+++ b/vcl/win/source/app/saltimer.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include <tools/svwin.h>
+#include <windows.h>
 #ifdef __MINGW32__
 #include <excpt.h>
 #endif
diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx
index 4c61358d727a..3b238816b172 100644
--- a/vcl/win/source/gdi/salbmp.cxx
+++ b/vcl/win/source/gdi/salbmp.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include <tools/svwin.h>
+#include <windows.h>
 #include <wincomp.hxx>
 #include <vcl/salbtype.hxx>
 #include <salgdi.h>
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index 14eeb89046a7..43beb67072c5 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -31,7 +31,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <tools/svwin.h>
+#include <windows.h>
 #include <wincomp.hxx>
 #include <saldata.hxx>
 #include <salgdi.h>
diff --git a/vcl/win/source/gdi/salgdi2.cxx b/vcl/win/source/gdi/salgdi2.cxx
index 90123100c7ee..68e1b8df2742 100644
--- a/vcl/win/source/gdi/salgdi2.cxx
+++ b/vcl/win/source/gdi/salgdi2.cxx
@@ -31,7 +31,7 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <tools/svwin.h>
+#include <windows.h>
 #include <tools/debug.hxx>
 #include <wincomp.hxx>
 #include <salbmp.h>
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index e2fe11dfc499..27f302f25491 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -33,7 +33,7 @@
 #include <malloc.h>
 
 #include <vcl/sysdata.hxx>
-#include "tools/svwin.h"
+#include <windows.h>
 
 #include "wincomp.hxx"
 #include "saldata.hxx"
diff --git a/vcl/win/source/gdi/salgdi_gdiplus.cxx b/vcl/win/source/gdi/salgdi_gdiplus.cxx
index 49f56a452faf..e43d4db625e2 100644
--- a/vcl/win/source/gdi/salgdi_gdiplus.cxx
+++ b/vcl/win/source/gdi/salgdi_gdiplus.cxx
@@ -31,7 +31,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <tools/svwin.h>
+#include <windows.h>
 #include <wincomp.hxx>
 #include <saldata.hxx>
 #include <salgdi.h>
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index b233f97a15ee..7931598d5a52 100644
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.cxx
@@ -32,7 +32,7 @@
 #define WINVER 0x0500
 
 #include <string.h>
-#include <tools/svwin.h>
+#include <windows.h>
 
 #ifdef __MINGW32__
 #include <excpt.h>
diff --git a/vcl/win/source/gdi/salvd.cxx b/vcl/win/source/gdi/salvd.cxx
index 40b13dc9bf17..2af02686b579 100644
--- a/vcl/win/source/gdi/salvd.cxx
+++ b/vcl/win/source/gdi/salvd.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include <tools/svwin.h>
+#include <windows.h>
 #include <wincomp.hxx>
 #include <saldata.hxx>
 #include <salinst.h>
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 1c47b21d550d..8c9953b32b45 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "tools/svwin.h"
+#include <windows.h>
 
 #include "salgdi.h"
 #include "saldata.hxx"
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 15be14eac5be..9519099d0f53 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -47,7 +47,7 @@
 
 #include <stdio.h>
 
-#include <tools/svwin.h>
+#include <windows.h>
 #ifdef __MINGW32__
 #include <excpt.h>
 #endif
diff --git a/vcl/win/source/window/salmenu.cxx b/vcl/win/source/window/salmenu.cxx
index d92039194f7a..e77fb07b7140 100644
--- a/vcl/win/source/window/salmenu.cxx
+++ b/vcl/win/source/window/salmenu.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include <tools/svwin.h>
+#include <windows.h>
 #include <wincomp.hxx>
 #include <saldata.hxx>
 #include <salinst.h>
diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx
index 5e034564d4cf..97b7ba92813e 100644
--- a/vcl/win/source/window/salobj.cxx
+++ b/vcl/win/source/window/salobj.cxx
@@ -31,7 +31,7 @@
 
 #include <string.h>
 
-#include <tools/svwin.h>
+#include <windows.h>
 #include <wincomp.hxx>
 #include <saldata.hxx>
 #include <salinst.h>
@@ -875,4 +875,4 @@ void WinSalObject::InterceptChildWindowKeyDown( sal_Bool bIntercept )
     mbInterceptChildWindowKeyDown = bIntercept;
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */