From 4aeaf2e0b8856d1617a301467c15d8fef00be2b5 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Fri, 25 Mar 2011 18:57:59 +0100 Subject: Wholesale prewin.h/postwin.h removal --- avmedia/source/gstreamer/gstframegrabber.cxx | 2 -- avmedia/source/win/framegrabber.cxx | 2 -- avmedia/source/win/player.cxx | 2 -- avmedia/source/win/window.cxx | 2 -- basic/source/app/process.cxx | 4 ---- basic/source/runtime/methods.cxx | 2 -- basic/source/sbx/sbxdec.hxx | 5 ----- desktop/source/app/appsys.cxx | 2 -- desktop/source/app/lockfile.cxx | 5 +---- desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 2 -- fpicker/source/generic/fpicker.cxx | 2 -- fpicker/source/odma/ODMAFilePicker.cxx | 2 -- fpicker/source/odma/ODMAFolderPicker.cxx | 2 -- framework/source/uielement/recentfilesmenucontroller.cxx | 2 -- ucb/source/ucp/odma/odma_lib.cxx | 2 -- ucb/source/ucp/odma/odma_provider.hxx | 2 -- 16 files changed, 1 insertion(+), 39 deletions(-) diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx index e0b161c483..fc775fe012 100755 --- a/avmedia/source/gstreamer/gstframegrabber.cxx +++ b/avmedia/source/gstreamer/gstframegrabber.cxx @@ -26,13 +26,11 @@ * ************************************************************************/ -#include #include #include #include #include #include -#include #include "framegrabber.hxx" #include "player.hxx" diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx index 9633aa7e98..ced849bc8a 100755 --- a/avmedia/source/win/framegrabber.cxx +++ b/avmedia/source/win/framegrabber.cxx @@ -26,7 +26,6 @@ * ************************************************************************/ -#include #if defined _MSC_VER #pragma warning(push, 1) #pragma warning(disable: 4917) @@ -43,7 +42,6 @@ #if defined _MSC_VER #pragma warning(pop) #endif -#include #include "framegrabber.hxx" #include "player.hxx" diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx index f44f22f63b..133d26eda9 100755 --- a/avmedia/source/win/player.cxx +++ b/avmedia/source/win/player.cxx @@ -26,7 +26,6 @@ * ************************************************************************/ -#include #if defined _MSC_VER #pragma warning(push, 1) #pragma warning(disable: 4917) @@ -39,7 +38,6 @@ #if defined _MSC_VER #pragma warning(pop) #endif -#include #include "player.hxx" #include "framegrabber.hxx" diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx index 1f9dd0f3b4..7d7a1cdef9 100755 --- a/avmedia/source/win/window.cxx +++ b/avmedia/source/win/window.cxx @@ -26,7 +26,6 @@ * ************************************************************************/ -#include #if defined _MSC_VER #pragma warning(push, 1) #pragma warning(disable: 4917) @@ -38,7 +37,6 @@ #if defined _MSC_VER #pragma warning(pop) #endif -#include #include #include "window.hxx" diff --git a/basic/source/app/process.cxx b/basic/source/app/process.cxx index 6289b5d8ea..7d507ecb3f 100755 --- a/basic/source/app/process.cxx +++ b/basic/source/app/process.cxx @@ -30,10 +30,6 @@ #include "precompiled_basic.hxx" -#ifdef WNT -#include -#include -#endif #include #include #include diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 2a319c4b08..52ead18f8d 100755 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -52,8 +52,6 @@ #include "runtime.hxx" #include "sbunoobj.hxx" #ifdef WNT -#include -#include #include #else #include diff --git a/basic/source/sbx/sbxdec.hxx b/basic/source/sbx/sbxdec.hxx index 69ca70797a..f94167b589 100755 --- a/basic/source/sbx/sbxdec.hxx +++ b/basic/source/sbx/sbxdec.hxx @@ -34,17 +34,12 @@ #undef WB_LEFT #undef WB_RIGHT -#include -} // close extern "C" { #ifndef __MINGW32__ #include #endif #include -extern "C" { // reopen extern "C" { -#include - #endif #endif #include diff --git a/desktop/source/app/appsys.cxx b/desktop/source/app/appsys.cxx index 06264c37d8..d28ddaeb99 100755 --- a/desktop/source/app/appsys.cxx +++ b/desktop/source/app/appsys.cxx @@ -35,8 +35,6 @@ #include #include -#include -#include #include diff --git a/desktop/source/app/lockfile.cxx b/desktop/source/app/lockfile.cxx index c2b2b1b0ec..a41f652f75 100755 --- a/desktop/source/app/lockfile.cxx +++ b/desktop/source/app/lockfile.cxx @@ -30,10 +30,7 @@ #include "precompiled_desktop.hxx" #include #include -#ifdef WNT -#include -#include -#else +#ifndef WNT #include #endif #include diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index 4fa87eb438..0c7f73690c 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -102,9 +102,7 @@ #endif #ifdef WNT -#include "prewin.h" #include -#include "postwin.h" #endif diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx index 83f336b593..69bb2ff2c2 100644 --- a/fpicker/source/generic/fpicker.cxx +++ b/fpicker/source/generic/fpicker.cxx @@ -35,8 +35,6 @@ #include "com/sun/star/lang/XMultiComponentFactory.hpp" #ifdef WNT -#include -#include #include #endif diff --git a/fpicker/source/odma/ODMAFilePicker.cxx b/fpicker/source/odma/ODMAFilePicker.cxx index 80b767dd91..cd87c809ec 100644 --- a/fpicker/source/odma/ODMAFilePicker.cxx +++ b/fpicker/source/odma/ODMAFilePicker.cxx @@ -49,8 +49,6 @@ #include #ifndef ODMA_LIB_HXX -#include -#include #include #endif diff --git a/fpicker/source/odma/ODMAFolderPicker.cxx b/fpicker/source/odma/ODMAFolderPicker.cxx index 15490f4503..49963c37b2 100644 --- a/fpicker/source/odma/ODMAFolderPicker.cxx +++ b/fpicker/source/odma/ODMAFolderPicker.cxx @@ -43,9 +43,7 @@ #include #ifndef ODMA_LIB_HXX -#include #include -#include #endif // using ---------------------------------------------------------------- diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index dd0c954c9a..9f5e81ec36 100755 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -59,8 +59,6 @@ #include #include #ifdef WNT -#include -#include #include #endif #include diff --git a/ucb/source/ucp/odma/odma_lib.cxx b/ucb/source/ucp/odma/odma_lib.cxx index e83962feef..54d2f02093 100755 --- a/ucb/source/ucp/odma/odma_lib.cxx +++ b/ucb/source/ucp/odma/odma_lib.cxx @@ -30,8 +30,6 @@ #include "precompiled_ucb.hxx" #include #include -#include -#include #include "odma_lib.hxx" diff --git a/ucb/source/ucp/odma/odma_provider.hxx b/ucb/source/ucp/odma/odma_provider.hxx index ce0e3d179f..691ca71d36 100755 --- a/ucb/source/ucp/odma/odma_provider.hxx +++ b/ucb/source/ucp/odma/odma_provider.hxx @@ -30,8 +30,6 @@ #define ODMA_PROVIDER_HXX #include -#include -#include #include "odma_lib.hxx" #include "rtl/ref.hxx" -- cgit v1.2.3