diff options
| -rwxr-xr-x | avmedia/source/gstreamer/gstframegrabber.cxx | 2 | ||||
| -rwxr-xr-x | avmedia/source/win/framegrabber.cxx | 2 | ||||
| -rwxr-xr-x | avmedia/source/win/player.cxx | 2 | ||||
| -rwxr-xr-x | avmedia/source/win/window.cxx | 2 | ||||
| -rwxr-xr-x | basic/source/app/process.cxx | 4 | ||||
| -rwxr-xr-x | basic/source/runtime/methods.cxx | 2 | ||||
| -rwxr-xr-x | basic/source/sbx/sbxdec.hxx | 5 | ||||
| -rwxr-xr-x | desktop/source/app/appsys.cxx | 2 | ||||
| -rwxr-xr-x | desktop/source/app/lockfile.cxx | 5 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 2 | ||||
| -rw-r--r-- | fpicker/source/generic/fpicker.cxx | 2 | ||||
| -rw-r--r-- | fpicker/source/odma/ODMAFilePicker.cxx | 2 | ||||
| -rw-r--r-- | fpicker/source/odma/ODMAFolderPicker.cxx | 2 | ||||
| -rwxr-xr-x | framework/source/uielement/recentfilesmenucontroller.cxx | 2 | ||||
| -rwxr-xr-x | ucb/source/ucp/odma/odma_lib.cxx | 2 | ||||
| -rwxr-xr-x | ucb/source/ucp/odma/odma_provider.hxx | 2 |
16 files changed, 1 insertions, 39 deletions
diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx index e0b161c483fc..fc775fe01287 100755 --- a/avmedia/source/gstreamer/gstframegrabber.cxx +++ b/avmedia/source/gstreamer/gstframegrabber.cxx @@ -26,13 +26,11 @@ * ************************************************************************/ -#include <prewin.h> #include <objbase.h> #include <strmif.h> #include <Amvideo.h> #include <Qedit.h> #include <uuids.h> -#include <postwin.h> #include "framegrabber.hxx" #include "player.hxx" diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx index 4f8a20475d79..9bf8cf956aa0 100755 --- a/avmedia/source/win/framegrabber.cxx +++ b/avmedia/source/win/framegrabber.cxx @@ -26,7 +26,6 @@ * ************************************************************************/ -#include <prewin.h> #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 <postwin.h> #include "framegrabber.hxx" #include "player.hxx" diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx index d80472049bf2..c2dea25f22c0 100755 --- a/avmedia/source/win/player.cxx +++ b/avmedia/source/win/player.cxx @@ -26,7 +26,6 @@ * ************************************************************************/ -#include <prewin.h> #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 <postwin.h> #include "player.hxx" #include "framegrabber.hxx" diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx index a6f0bd85a15c..c1b543d2a9a3 100755 --- a/avmedia/source/win/window.cxx +++ b/avmedia/source/win/window.cxx @@ -26,7 +26,6 @@ * ************************************************************************/ -#include <prewin.h> #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 <postwin.h> #include <com/sun/star/awt/SystemPointer.hdl> #include "window.hxx" diff --git a/basic/source/app/process.cxx b/basic/source/app/process.cxx index 6289b5d8eac3..7d507ecb3f33 100755 --- a/basic/source/app/process.cxx +++ b/basic/source/app/process.cxx @@ -30,10 +30,6 @@ #include "precompiled_basic.hxx" -#ifdef WNT -#include <prewin.h> -#include <postwin.h> -#endif #include <tools/errcode.hxx> #include <basic/sbxcore.hxx> #include <tools/string.hxx> diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 1d5fd67f0302..eebb2e133449 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 <prewin.h> -#include <postwin.h> #include <tools/fsys.hxx> #else #include <osl/file.hxx> diff --git a/basic/source/sbx/sbxdec.hxx b/basic/source/sbx/sbxdec.hxx index c783010f0ed2..45dc041a0b7d 100755 --- a/basic/source/sbx/sbxdec.hxx +++ b/basic/source/sbx/sbxdec.hxx @@ -34,17 +34,12 @@ #undef WB_LEFT #undef WB_RIGHT -#include <prewin.h> -} // close extern "C" { #ifndef __MINGW32__ #include <comutil.h> #endif #include <oleauto.h> -extern "C" { // reopen extern "C" { -#include <postwin.h> - #endif #endif #include <basic/sbx.hxx> diff --git a/desktop/source/app/appsys.cxx b/desktop/source/app/appsys.cxx index 287a9464793e..066fede0bd40 100755 --- a/desktop/source/app/appsys.cxx +++ b/desktop/source/app/appsys.cxx @@ -35,8 +35,6 @@ #include <rtl/ustring.hxx> #include <tools/solar.h> -#include <prewin.h> -#include <postwin.h> #include <tools/urlobj.hxx> diff --git a/desktop/source/app/lockfile.cxx b/desktop/source/app/lockfile.cxx index 5e534f2b2107..b07196cc5b36 100755 --- a/desktop/source/app/lockfile.cxx +++ b/desktop/source/app/lockfile.cxx @@ -30,10 +30,7 @@ #include "precompiled_desktop.hxx" #include <stdlib.h> #include <time.h> -#ifdef WNT -#include <prewin.h> -#include <postwin.h> -#else +#ifndef WNT #include <unistd.h> #endif #include <sal/types.h> diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index 84f3e0ec6444..4b514a4b39fc 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 <objbase.h> -#include "postwin.h" #endif diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx index 77171bce8aa1..11130f43400d 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 <prewin.h> -#include <postwin.h> #include <odma_lib.hxx> #endif diff --git a/fpicker/source/odma/ODMAFilePicker.cxx b/fpicker/source/odma/ODMAFilePicker.cxx index 80b767dd91f5..cd87c809ecc8 100644 --- a/fpicker/source/odma/ODMAFilePicker.cxx +++ b/fpicker/source/odma/ODMAFilePicker.cxx @@ -49,8 +49,6 @@ #include <unotools/ucbhelper.hxx> #ifndef ODMA_LIB_HXX -#include <prewin.h> -#include <postwin.h> #include <odma_lib.hxx> #endif diff --git a/fpicker/source/odma/ODMAFolderPicker.cxx b/fpicker/source/odma/ODMAFolderPicker.cxx index 15490f4503a8..49963c37b26c 100644 --- a/fpicker/source/odma/ODMAFolderPicker.cxx +++ b/fpicker/source/odma/ODMAFolderPicker.cxx @@ -43,9 +43,7 @@ #include <unotools/pathoptions.hxx> #ifndef ODMA_LIB_HXX -#include <prewin.h> #include <odma_lib.hxx> -#include <postwin.h> #endif // using ---------------------------------------------------------------- diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index a18751e270a9..93190e2f7789 100755 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -59,8 +59,6 @@ #include <cppuhelper/implbase1.hxx> #include <osl/file.hxx> #ifdef WNT -#include <prewin.h> -#include <postwin.h> #include <odma_lib.hxx> #endif #include <dispatch/uieventloghelper.hxx> diff --git a/ucb/source/ucp/odma/odma_lib.cxx b/ucb/source/ucp/odma/odma_lib.cxx index fde03a54c069..df1fcce1fdc9 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 <osl/module.h> #include <rtl/ustring.hxx> -#include <prewin.h> -#include <postwin.h> #include "odma_lib.hxx" diff --git a/ucb/source/ucp/odma/odma_provider.hxx b/ucb/source/ucp/odma/odma_provider.hxx index 6a552e3486cc..7f99bbeccdb7 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 <ucbhelper/providerhelper.hxx> -#include <prewin.h> -#include <postwin.h> #include "odma_lib.hxx" #include "rtl/ref.hxx" |