[Libreoffice-commits] .: toolkit/source toolkit/workben vcl/os2 vcl/source vcl/win
Fridrich Strba
fridrich at kemper.freedesktop.org
Fri Mar 25 16:23:28 PDT 2011
toolkit/source/awt/vclxtoolkit.cxx | 1 -
toolkit/source/awt/vclxwindow1.cxx | 2 +-
toolkit/workben/unodialog.cxx | 1 -
vcl/os2/source/gdi/os2layout.cxx | 2 --
vcl/os2/source/gdi/salgdi3.cxx | 1 -
vcl/source/glyphs/graphite_features.cxx | 3 +--
vcl/source/glyphs/graphite_layout.cxx | 3 +--
vcl/source/glyphs/graphite_textsrc.hxx | 6 +++---
vcl/win/inc/svsys.h | 2 --
vcl/win/source/app/saldata.cxx | 2 +-
vcl/win/source/app/salinst.cxx | 2 +-
vcl/win/source/app/salshl.cxx | 2 +-
vcl/win/source/app/saltimer.cxx | 2 +-
vcl/win/source/gdi/salbmp.cxx | 2 +-
vcl/win/source/gdi/salgdi.cxx | 2 +-
vcl/win/source/gdi/salgdi2.cxx | 2 +-
vcl/win/source/gdi/salgdi3.cxx | 2 +-
vcl/win/source/gdi/salgdi_gdiplus.cxx | 2 +-
vcl/win/source/gdi/salprn.cxx | 2 +-
vcl/win/source/gdi/salvd.cxx | 2 +-
vcl/win/source/gdi/winlayout.cxx | 2 +-
vcl/win/source/window/salframe.cxx | 2 +-
vcl/win/source/window/salmenu.cxx | 2 +-
vcl/win/source/window/salobj.cxx | 3 +--
24 files changed, 21 insertions(+), 31 deletions(-)
New commits:
commit dc6e8517b587288f965345c3b246276519af73f7
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Sat Mar 26 00:21:25 2011 +0100
Adapt the tree to tools/svwin.h removal
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index a763a73..be69153 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 28da272..5b259dd 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 b53e0e5..3340e31 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 3f2d4e4..f418439 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 770d86d..9f4c44c 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 dabb11f..98727cd 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 31b6d18..9a3cb27 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 88f5692..e43ff95 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 9dac2d6..763ea49 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 01ecc0a..44ec229 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 ee93cc9..5d89b51 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 0fb65b8..cf9b76f 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 5980e84..040bae9 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 63a9816..481210d 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 19637df..dfa0979 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 e4819fa..7602de4 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 3b9122d..4973eaf 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 9be66be..4165698 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 bb9ce80..bec0ab6 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 4bda30a..edfff21 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 6e608d1..d5a7acd 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 09bd619..623440b 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 4f0a387..a5cc4c4 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 99937f6..51d0123 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: */
More information about the Libreoffice-commits
mailing list