basic/source/sbx/sbxdec.hxx | 7 ++----- extensions/source/plugin/base/context.cxx | 1 - extensions/source/plugin/base/evtlstnr.cxx | 1 - extensions/source/plugin/base/manager.cxx | 1 - extensions/source/plugin/base/nfuncs.cxx | 1 - extensions/source/plugin/base/plcom.cxx | 1 - extensions/source/plugin/base/service.cxx | 1 - extensions/source/plugin/base/xplugin.cxx | 1 - extensions/source/plugin/win/sysplug.cxx | 1 - extensions/source/plugin/win/winmgr.cxx | 1 - extensions/source/scanner/scanwin.cxx | 1 - include/prewin.h | 9 --------- include/vcl/opengl/OpenGLContext.hxx | 1 - winaccessibility/source/service/msaaservice_impl.cxx | 1 - 14 files changed, 2 insertions(+), 26 deletions(-)
New commits: commit dfbcde184784e48fbb201f0ea473d3912e7859fb Author: Thomas Arnhold <[email protected]> Date: Fri May 9 22:21:17 2014 +0200 clean up nobody uses those switches Change-Id: Ifbd6563aae901b4f3d931422e6d4e2369aee0573 diff --git a/include/prewin.h b/include/prewin.h index 4720586..2ee8d9c 100644 --- a/include/prewin.h +++ b/include/prewin.h @@ -42,15 +42,6 @@ #include <shellapi.h> #include <commdlg.h> #include <dlgs.h> -#ifdef USE_TOOLHELP -#include <tlhelp32.h> -#endif -#ifdef USE_IMAGEHLP -#include <imagehlp.h> -#endif -#ifdef INCLUDE_MMSYSTEM -#include <mmsystem.h> -#endif #ifdef _MSC_VER #pragma warning(push, 1) #endif commit aa3548fba617e55360dbb93095e06c3784801a85 Author: Thomas Arnhold <[email protected]> Date: Fri May 9 20:31:30 2014 +0200 prewin.h includes windows.h Change-Id: I221e9f704f75472234a6ce2b09930aeff6279c7a diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx index 6db9b66..b441c99 100644 --- a/extensions/source/scanner/scanwin.cxx +++ b/extensions/source/scanner/scanwin.cxx @@ -29,7 +29,6 @@ #include <comphelper/processfactory.hxx> #include <prewin.h> -#include <windows.h> #include <postwin.h> #include <math.h> #include <tools/stream.hxx> diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx index 9efe3d8..a9df966 100644 --- a/include/vcl/opengl/OpenGLContext.hxx +++ b/include/vcl/opengl/OpenGLContext.hxx @@ -23,7 +23,6 @@ # include <postx.h> #elif defined( _WIN32 ) # include "prewin.h" -# include "windows.h" # include "postwin.h" #endif diff --git a/winaccessibility/source/service/msaaservice_impl.cxx b/winaccessibility/source/service/msaaservice_impl.cxx index 961a012..0e10e87 100644 --- a/winaccessibility/source/service/msaaservice_impl.cxx +++ b/winaccessibility/source/service/msaaservice_impl.cxx @@ -32,7 +32,6 @@ #include <vcl/window.hxx> #include <prewin.h> -#include <windows.h> #include <postwin.h> using namespace ::com::sun::star; // for odk interfaces commit f106f419567aec9b044216edb2bde030731fef5b Author: Thomas Arnhold <[email protected]> Date: Fri May 9 20:28:37 2014 +0200 postwin.h handles OPTIONAL already Change-Id: Ia04bc545f90a093f70bbd7036b7b9403af15daa1 diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx index 91214b7..39289f5 100644 --- a/extensions/source/plugin/base/context.cxx +++ b/extensions/source/plugin/base/context.cxx @@ -35,7 +35,6 @@ #ifdef WNT #include <prewin.h> #include <postwin.h> -#undef OPTIONAL #endif #include <cstdarg> diff --git a/extensions/source/plugin/base/evtlstnr.cxx b/extensions/source/plugin/base/evtlstnr.cxx index 1552a9b..6e6a58c 100644 --- a/extensions/source/plugin/base/evtlstnr.cxx +++ b/extensions/source/plugin/base/evtlstnr.cxx @@ -36,7 +36,6 @@ #ifdef WNT #include <prewin.h> #include <postwin.h> -#undef OPTIONAL #endif #include <cstdarg> diff --git a/extensions/source/plugin/base/manager.cxx b/extensions/source/plugin/base/manager.cxx index a83c4b9..8f55228 100644 --- a/extensions/source/plugin/base/manager.cxx +++ b/extensions/source/plugin/base/manager.cxx @@ -36,7 +36,6 @@ #ifdef WNT #include <prewin.h> #include <postwin.h> -#undef OPTIONAL #endif #include <cstdarg> diff --git a/extensions/source/plugin/base/nfuncs.cxx b/extensions/source/plugin/base/nfuncs.cxx index 796a4a1..aaf14bd 100644 --- a/extensions/source/plugin/base/nfuncs.cxx +++ b/extensions/source/plugin/base/nfuncs.cxx @@ -36,7 +36,6 @@ #ifdef WNT #include <prewin.h> #include <postwin.h> -#undef OPTIONAL #endif #include <cstdarg> diff --git a/extensions/source/plugin/base/plcom.cxx b/extensions/source/plugin/base/plcom.cxx index 034c2db..48a6bda 100644 --- a/extensions/source/plugin/base/plcom.cxx +++ b/extensions/source/plugin/base/plcom.cxx @@ -36,7 +36,6 @@ #ifdef WNT #include <prewin.h> #include <postwin.h> -#undef OPTIONAL #endif #ifdef SOLARIS diff --git a/extensions/source/plugin/base/service.cxx b/extensions/source/plugin/base/service.cxx index 6bef53e..310ddaf 100644 --- a/extensions/source/plugin/base/service.cxx +++ b/extensions/source/plugin/base/service.cxx @@ -36,7 +36,6 @@ #ifdef WNT #include <prewin.h> #include <postwin.h> -#undef OPTIONAL #endif #include <cstdarg> diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx index be7311a..83a488b 100644 --- a/extensions/source/plugin/base/xplugin.cxx +++ b/extensions/source/plugin/base/xplugin.cxx @@ -35,7 +35,6 @@ #ifdef WNT #include <prewin.h> #include <postwin.h> -#undef OPTIONAL #endif #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/extensions/source/plugin/win/sysplug.cxx b/extensions/source/plugin/win/sysplug.cxx index beae3b4..7d94acf 100644 --- a/extensions/source/plugin/win/sysplug.cxx +++ b/extensions/source/plugin/win/sysplug.cxx @@ -29,7 +29,6 @@ #include <prewin.h> #include <postwin.h> -#undef OPTIONAL #include <plugin/impl.hxx> diff --git a/extensions/source/plugin/win/winmgr.cxx b/extensions/source/plugin/win/winmgr.cxx index 11aa92f..8f531e7 100644 --- a/extensions/source/plugin/win/winmgr.cxx +++ b/extensions/source/plugin/win/winmgr.cxx @@ -29,7 +29,6 @@ #include <prewin.h> #include <postwin.h> -#undef OPTIONAL #include "vcl/svapp.hxx" #include "tools/urlobj.hxx" commit 7f1f1dbfdade10824ef5a2233306bffb5198acc0 Author: Thomas Arnhold <[email protected]> Date: Fri May 9 20:22:59 2014 +0200 prewin.h handles WB_LEFT and WB_RIGHT already Change-Id: I73bbd6ae7343257e63210cb4b5cdfd4e9f612122 diff --git a/basic/source/sbx/sbxdec.hxx b/basic/source/sbx/sbxdec.hxx index 5cabb53..1e6c91b 100644 --- a/basic/source/sbx/sbxdec.hxx +++ b/basic/source/sbx/sbxdec.hxx @@ -21,11 +21,7 @@ #ifndef INCLUDED_BASIC_SOURCE_SBX_SBXDEC_HXX #define INCLUDED_BASIC_SOURCE_SBX_SBXDEC_HXX -#ifdef WIN32 - -#undef WB_LEFT -#undef WB_RIGHT - +#ifdef WNT #include <prewin.h> #include <postwin.h> @@ -36,6 +32,7 @@ #endif #endif + #include <basic/sbx.hxx> #include <com/sun/star/bridge/oleautomation/Decimal.hpp> _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
