ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Use even more WIN32_LEAN_AND_MEAN

Browse Source 
Change-Id: I538fe5b41156366e0e87b3a93e58a3947afd18f5
Reviewed-on: https://gerrit.libreoffice.org/42398
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski
2017-09-18 01:13:30 +02:00
parent 164f6ba4e2
commit afeff9102c
39 changed files with 118 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
+3
View File
@@ -20,6 +20,9 @@
#if defined _MSC_VER
#pragma warning(push, 1)
#endif
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#if defined _MSC_VER
#pragma warning(pop)
extensions/source/config/ldap/ldapaccess.hxx
+3
View File
@@ -25,6 +25,9 @@
#include <map>
#ifdef _WIN32
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include <winldap.h>
#else // !defined WNT
hwpfilter/source/mzstring.cxx
+3
View File
@@ -24,6 +24,9 @@
#include "mzstring.h"
#ifdef _WIN32
# if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
# endif
# include <windows.h>
#endif
#include <stdio.h>
idlc/source/options.cxx
+3 -15
View File
@@ -28,24 +28,12 @@
#include "osl/file.hxx"
#ifdef _WIN32
# if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
# endif
# include <windows.h>
#endif
/*
#ifndef WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
# ifdef _MSC_VER
# pragma warning(push,1)
# endif
# include <windows.h>
# ifdef _MSC_VER
# pragma warning(pop)
# endif
# include <tchar.h>
# undef WIN32_LEAN_AND_MEAN
#endif
*/
#include <stdio.h>
#include <string.h>
include/connectivity/odbc.hxx
+3
View File
@@ -32,6 +32,9 @@
// just to go with calling convention of windows
#if SYSTEM_ODBC_HEADERS
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#define SQL_API __stdcall
#include <sqlext.h>
l10ntools/source/helpmerge.cxx
+3
View File
@@ -36,6 +36,9 @@
#include <vector>
#include <rtl/strbuf.hxx>
#ifdef _WIN32
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#undef CopyFile
#include <direct.h>
lingucomponent/source/lingutil/lingutil.cxx
+3
View File
@@ -18,6 +18,9 @@
*/
#if defined(_WIN32)
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#endif
sal/osl/w32/backtrace.cxx
+3
View File
@@ -12,6 +12,9 @@
#include <limits>
#include <memory>
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include <process.h>
#include <iostream>
sal/osl/w32/dllentry.cxx
+4 -10
View File
@@ -17,19 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifdef _MSC_VER
#pragma warning(push,1) /* disable warnings within system headers */
#endif
#include <windows.h>
#ifdef _MSC_VER
#pragma warning(pop)
#include <systools/win32/uwinapi.h>
#include <tlhelp32.h>
#include <rpc.h>
#include <winsock.h>
#ifdef _DEBUG
#include <crtdbg.h>
#endif
#endif
#include <tlhelp32.h>
#include <systools/win32/uwinapi.h>
#include <winsock.h>
#include <osl/diagnose.h>
#include <sal/types.h>
#include <float.h>
setup_native/source/win32/customactions/regactivex/regactivex.cxx
+3
View File
@@ -22,6 +22,9 @@
#ifdef _MSC_VER
#pragma warning(push, 1) /* disable warnings within system headers */
#endif
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include <msiquery.h>
#ifdef _MSC_VER
shell/inc/spsupp/registrar.hpp
+3
View File
@@ -10,6 +10,9 @@
#ifndef INCLUDED_SHELL_INC_SPSUPP_REGISTRAR_H
#define INCLUDED_SHELL_INC_SPSUPP_REGISTRAR_H
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include "windows.h"
class Registrar {
shell/source/backends/localebe/localebackend.cxx
+3
View File
@@ -34,6 +34,9 @@
#if defined _MSC_VER
#pragma warning(push, 1)
#endif
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#if defined _MSC_VER
#pragma warning(pop)
shell/source/backends/wininetbe/wininetbackend.cxx
+3
View File
@@ -25,6 +25,9 @@
#if defined _MSC_VER
#pragma warning(push, 1)
#endif
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include <wininet.h>
#include <sal/alloca.h>
shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
+3
View File
@@ -48,6 +48,9 @@
#if defined _MSC_VER
#pragma warning(push, 1)
#endif
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#if defined _MSC_VER
#pragma warning(pop)
shell/source/win32/shlxthandler/ooofilt/propspec.cxx
+3
View File
@@ -29,6 +29,9 @@
#if defined _MSC_VER
#pragma warning(push, 1)
#endif
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include <filter.h>
#if defined _MSC_VER
shell/source/win32/shlxthandler/ooofilt/propspec.hxx
+3
View File
@@ -27,6 +27,9 @@
#if defined _MSC_VER
#pragma warning(push, 1)
#endif
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include <ole2.h>
#include <ntquery.h>
shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
+3
View File
@@ -21,6 +21,9 @@
#if defined _MSC_VER
#pragma warning(push, 1)
#endif
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#if defined _MSC_VER
#pragma warning(pop)
shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx
+3
View File
@@ -23,6 +23,9 @@
#if defined _MSC_VER
#pragma warning(push, 1)
#endif
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#if defined _MSC_VER
#pragma warning(pop)
shell/source/win32/shlxthandler/util/registry.cxx
+3
View File
@@ -21,6 +21,9 @@
#if defined _MSC_VER
#pragma warning(push, 1)
#endif
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#if defined _MSC_VER
#pragma warning(pop)
shell/source/win32/spsupp/registrar.cxx
+1
View File
@@ -9,6 +9,7 @@
#include "registrar.hpp"
#include "wchar.h"
#include "objbase.h"
namespace {
soltools/mkdepend/collectdircontent.hxx
+3
View File
@@ -9,6 +9,9 @@
#include <string>
#if defined(_WIN32)
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include <algorithm>
#else
svl/source/config/languageoptions.cxx
+3
View File
@@ -30,6 +30,9 @@
#include "officecfg/System.hxx"
#ifdef _WIN32
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#endif
svl/source/svdde/ddeimp.hxx
+3
View File
@@ -20,6 +20,9 @@
#ifndef INCLUDED_SVL_SOURCE_SVDDE_DDEIMP_HXX
#define INCLUDED_SVL_SOURCE_SVDDE_DDEIMP_HXX
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include <ddeml.h>
sw/source/ui/vba/vbasystem.cxx
+3
View File
@@ -29,6 +29,9 @@
#pragma warning (push, 1)
#pragma warning (disable: 4005)
#endif
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#if defined _MSC_VER
#pragma warning (pop)
tools/source/datetime/tdate.cxx
+3
View File
@@ -18,6 +18,9 @@
*/
#if defined(_WIN32)
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#else
#include <time.h>
tools/source/datetime/ttime.cxx
+3
View File
@@ -22,6 +22,9 @@
#include <cerrno>
#if defined(_WIN32)
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include <mmsystem.h>
#elif defined UNX
tools/source/stream/strmwnt.cxx
+3
View File
@@ -23,6 +23,9 @@
#include <limits.h>
#ifdef _WIN32
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#endif
vcl/opengl/win/WinDeviceInfo.cxx
+4
View File
@@ -12,7 +12,11 @@
#include "opengl/win/blocklist_parser.hxx"
#include <config_folders.h>
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include <objbase.h>
#include <setupapi.h>
#include <algorithm>
#include <cstdint>
vcl/win/window/keynames.cxx
+3
View File
@@ -23,6 +23,9 @@
#include <win/salframe.h>
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
// Use unique ;) names to avoid clashes with the KEY_* (especially
vcl/win/window/salframe.cxx
+3
View File
@@ -88,6 +88,9 @@
#include <time.h>
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include <shobjidl.h>
#include <propkey.h>
winaccessibility/inc/AccObject.hxx
+4 -1
View File
@@ -22,8 +22,11 @@
#include <vector>
#include <map>
#include <oleacc.h>
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include <oleacc.h>
#include <rtl/ref.hxx>
winaccessibility/inc/AccObjectWinManager.hxx
+3
View File
@@ -22,6 +22,9 @@
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <map>
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include <rtl/ref.hxx>
#include "ResIDGenerator.hxx"
winaccessibility/source/UAccCOM/stdafx.h
+3
View File
@@ -31,6 +31,9 @@
#define _ATL_APARTMENT_THREADED
#include <prewin.h>
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#if defined __clang__
xmlhelp/source/cxxhelp/provider/databases.cxx
+3
View File
@@ -68,6 +68,9 @@
#include "urlparameter.hxx"
#ifdef _WIN32
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#endif
xmlsecurity/source/xmlsec/mscrypt/akmngr.hxx
+3
View File
@@ -19,6 +19,9 @@
#ifndef INCLUDED_XMLSECURITY_SOURCE_XMLSEC_MSCRYPT_AKMNGR_HXX
#define INCLUDED_XMLSECURITY_SOURCE_XMLSEC_MSCRYPT_AKMNGR_HXX
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include <wincrypt.h>
xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx
+3
View File
@@ -23,6 +23,9 @@
#ifdef _MSC_VER
#pragma warning(push,1)
#endif
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include "Windows.h"
#include "WinCrypt.h"
#ifdef _MSC_VER
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
+3
View File
@@ -25,6 +25,9 @@
#ifdef _MSC_VER
#pragma warning(push,1)
#endif
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include "Windows.h"
#include "WinCrypt.h"
#ifdef _MSC_VER
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
+3
View File
@@ -23,6 +23,9 @@
#ifdef _MSC_VER
#pragma warning(push,1)
#endif
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include <wincrypt.h>
#ifdef _MSC_VER
xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx
+3
View File
@@ -23,6 +23,9 @@
#ifdef _MSC_VER
#pragma warning(push,1)
#endif
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include "Windows.h"
#include "WinCrypt.h"
#ifdef _MSC_VER