diff options
author | Tor Lillqvist <tlillqvist@novell.com> | 2011-02-08 13:06:29 +0200 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-02-08 14:01:12 +0200 |
commit | 2bebe311aa88fd782bf0fb502642da0fd4311053 (patch) | |
tree | 054180d26217eabf7f87775ed3e611c0916dd33e | |
parent | 901e19024cbc74402359f86a80be87d085f2fa30 (diff) |
Adapt to move of prewin.h and postwin.h
-rw-r--r-- | avmedia/source/gstreamer/gstframegrabber.cxx | 4 | ||||
-rw-r--r-- | avmedia/source/win/framegrabber.cxx | 4 | ||||
-rw-r--r-- | avmedia/source/win/player.cxx | 4 | ||||
-rw-r--r-- | avmedia/source/win/window.cxx | 4 | ||||
-rw-r--r-- | basic/source/app/process.cxx | 4 | ||||
-rw-r--r-- | basic/source/runtime/methods.cxx | 4 | ||||
-rw-r--r-- | basic/source/sbx/sbxdec.hxx | 4 | ||||
-rw-r--r-- | desktop/source/app/appsys.cxx | 4 | ||||
-rw-r--r-- | desktop/source/app/lockfile.cxx | 4 | ||||
-rw-r--r-- | desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 4 | ||||
-rw-r--r-- | fpicker/source/generic/fpicker.cxx | 4 | ||||
-rw-r--r-- | fpicker/source/odma/ODMAFilePicker.cxx | 4 | ||||
-rw-r--r-- | fpicker/source/odma/ODMAFolderPicker.cxx | 4 | ||||
-rw-r--r-- | framework/source/uielement/recentfilesmenucontroller.cxx | 4 | ||||
-rw-r--r-- | ucb/source/ucp/odma/odma_lib.cxx | 4 | ||||
-rw-r--r-- | ucb/source/ucp/odma/odma_provider.hxx | 4 |
16 files changed, 32 insertions, 32 deletions
diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx index bb3678d2b903..60abcb5201f5 100644 --- a/avmedia/source/gstreamer/gstframegrabber.cxx +++ b/avmedia/source/gstreamer/gstframegrabber.cxx @@ -26,14 +26,14 @@ * ************************************************************************/ -#include <tools/prewin.h> +#include <prewin.h> #include <windows.h> #include <objbase.h> #include <strmif.h> #include <Amvideo.h> #include <Qedit.h> #include <uuids.h> -#include <tools/postwin.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 3cfe5f89264d..195319e463a5 100644 --- a/avmedia/source/win/framegrabber.cxx +++ b/avmedia/source/win/framegrabber.cxx @@ -26,7 +26,7 @@ * ************************************************************************/ -#include <tools/prewin.h> +#include <prewin.h> #if defined _MSC_VER #pragma warning(push, 1) #pragma warning(disable: 4917) @@ -44,7 +44,7 @@ #if defined _MSC_VER #pragma warning(pop) #endif -#include <tools/postwin.h> +#include <postwin.h> #include "framegrabber.hxx" #include "player.hxx" diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx index 10ee2f2b9734..f05160944251 100644 --- a/avmedia/source/win/player.cxx +++ b/avmedia/source/win/player.cxx @@ -26,7 +26,7 @@ * ************************************************************************/ -#include <tools/prewin.h> +#include <prewin.h> #if defined _MSC_VER #pragma warning(push, 1) #pragma warning(disable: 4917) @@ -40,7 +40,7 @@ #if defined _MSC_VER #pragma warning(pop) #endif -#include <tools/postwin.h> +#include <postwin.h> #include "player.hxx" #include "framegrabber.hxx" diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx index d0d25f32d091..7b7b5c8061a7 100644 --- a/avmedia/source/win/window.cxx +++ b/avmedia/source/win/window.cxx @@ -26,7 +26,7 @@ * ************************************************************************/ -#include <tools/prewin.h> +#include <prewin.h> #if defined _MSC_VER #pragma warning(push, 1) #pragma warning(disable: 4917) @@ -39,7 +39,7 @@ #if defined _MSC_VER #pragma warning(pop) #endif -#include <tools/postwin.h> +#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 397eaadbdfee..5e7a78d05abf 100644 --- a/basic/source/app/process.cxx +++ b/basic/source/app/process.cxx @@ -31,9 +31,9 @@ #ifdef WNT -#include <tools/prewin.h> +#include <prewin.h> #include "winbase.h" -#include <tools/postwin.h> +#include <postwin.h> #endif #include <tools/errcode.hxx> #include <basic/sbxcore.hxx> diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index ed9b9fed8436..4c7c9e7b87e9 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -52,9 +52,9 @@ #include "runtime.hxx" #include "sbunoobj.hxx" #ifdef WNT -#include <tools/prewin.h> +#include <prewin.h> #include "winbase.h" -#include <tools/postwin.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 fcd7edbe1bc7..5438c151e60f 100644 --- a/basic/source/sbx/sbxdec.hxx +++ b/basic/source/sbx/sbxdec.hxx @@ -34,7 +34,7 @@ #undef WB_LEFT #undef WB_RIGHT -#include <tools/prewin.h> +#include <prewin.h> } // close extern "C" { #ifndef __MINGW32__ @@ -43,7 +43,7 @@ #include <oleauto.h> extern "C" { // reopen extern "C" { -#include <tools/postwin.h> +#include <postwin.h> #endif #endif diff --git a/desktop/source/app/appsys.cxx b/desktop/source/app/appsys.cxx index ac01ec2dd669..7c350b4d5a7b 100644 --- a/desktop/source/app/appsys.cxx +++ b/desktop/source/app/appsys.cxx @@ -35,9 +35,9 @@ #include <rtl/ustring.hxx> #include <tools/solar.h> -#include <tools/prewin.h> +#include <prewin.h> #include <winreg.h> -#include <tools/postwin.h> +#include <postwin.h> #include <tools/urlobj.hxx> diff --git a/desktop/source/app/lockfile.cxx b/desktop/source/app/lockfile.cxx index d75e5b8bc5f8..931a0921fb14 100644 --- a/desktop/source/app/lockfile.cxx +++ b/desktop/source/app/lockfile.cxx @@ -31,9 +31,9 @@ #include <stdlib.h> #include <time.h> #ifdef WNT -#include <tools/prewin.h> +#include <prewin.h> #include <windows.h> -#include <tools/postwin.h> +#include <postwin.h> #else #include <unistd.h> #endif diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index a202e592d9c3..4eefa7cbdc12 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -102,9 +102,9 @@ #endif #ifdef WNT -#include "tools/prewin.h" +#include "prewin.h" #include <objbase.h> -#include "tools/postwin.h" +#include "postwin.h" #endif diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx index 0f207a3fe57b..1bfdf5a8fae7 100644 --- a/fpicker/source/generic/fpicker.cxx +++ b/fpicker/source/generic/fpicker.cxx @@ -35,8 +35,8 @@ #include "com/sun/star/lang/XMultiComponentFactory.hpp" #ifdef WNT -#include <tools/prewin.h> -#include <tools/postwin.h> +#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 685da9f377eb..80b767dd91f5 100644 --- a/fpicker/source/odma/ODMAFilePicker.cxx +++ b/fpicker/source/odma/ODMAFilePicker.cxx @@ -49,8 +49,8 @@ #include <unotools/ucbhelper.hxx> #ifndef ODMA_LIB_HXX -#include <tools/prewin.h> -#include <tools/postwin.h> +#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 5c9536ac3290..15490f4503a8 100644 --- a/fpicker/source/odma/ODMAFolderPicker.cxx +++ b/fpicker/source/odma/ODMAFolderPicker.cxx @@ -43,9 +43,9 @@ #include <unotools/pathoptions.hxx> #ifndef ODMA_LIB_HXX -#include <tools/prewin.h> +#include <prewin.h> #include <odma_lib.hxx> -#include <tools/postwin.h> +#include <postwin.h> #endif // using ---------------------------------------------------------------- diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index 54fed3dfb0a8..87c7917bcaf9 100644 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -59,8 +59,8 @@ #include <cppuhelper/implbase1.hxx> #include <osl/file.hxx> #ifdef WNT -#include <tools/prewin.h> -#include <tools/postwin.h> +#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 5d465b94edda..f8a079b101cf 100644 --- a/ucb/source/ucp/odma/odma_lib.cxx +++ b/ucb/source/ucp/odma/odma_lib.cxx @@ -30,8 +30,8 @@ #include "precompiled_ucb.hxx" #include <osl/module.h> #include <rtl/ustring.hxx> -#include <tools/prewin.h> -#include <tools/postwin.h> +#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 e65507073d08..6a552e3486cc 100644 --- a/ucb/source/ucp/odma/odma_provider.hxx +++ b/ucb/source/ucp/odma/odma_provider.hxx @@ -30,8 +30,8 @@ #define ODMA_PROVIDER_HXX #include <ucbhelper/providerhelper.hxx> -#include <tools/prewin.h> -#include <tools/postwin.h> +#include <prewin.h> +#include <postwin.h> #include "odma_lib.hxx" #include "rtl/ref.hxx" |