Some more WIN32_LEAN_AND_MEAN

Change-Id: Iadb0ebb66809c192fb817b8c7cf2f8cdb4d0b874
Reviewed-on: https://gerrit.libreoffice.org/42419Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

avmedia/source/vlc/wrapper/SymbolLoader.hxx

@@ -10,6 +10,9 @@
 #ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_SYMBOLLOADER_HXX
 #define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_SYMBOLLOADER_HXX
 #if defined(_WIN32)
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 # include <windows.h>
 # include <winreg.h>
 #endif

basic/qa/cppunit/test_vba.cxx

@@ -13,6 +13,9 @@
 #ifdef _WIN32
 #include <string.h>
 
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #include <odbcinst.h>
 #endif

bridges/source/cpp_uno/msvc_win32_intel/dllinit.cxx

@@ -18,6 +18,9 @@
  */
 
 
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #pragma warning(push,1) // disable warnings within system headers
 #include <windows.h>
 #pragma warning(pop)

bridges/source/cpp_uno/msvc_win32_intel/msci.hxx

@@ -19,6 +19,9 @@
 #ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_MSVC_WIN32_INTEL_MSCI_HXX
 #define INCLUDED_BRIDGES_SOURCE_CPP_UNO_MSVC_WIN32_INTEL_MSCI_HXX
 
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #pragma warning(push, 1)
 #include <windows.h>
 #pragma warning(pop)

chart2/source/view/charttypes/GL3DBarChart.cxx

@@ -22,6 +22,9 @@
 
 #include <osl/time.h>
 #ifdef _WIN32
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #endif
 #include <memory>

cli_ure/source/native/native_bootstrap.cxx

@@ -24,6 +24,9 @@
 #ifdef _MSC_VER
 #pragma warning(push, 1)
 #endif
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #ifdef _MSC_VER
 #pragma warning(pop)

cli_ure/source/uno_bridge/cli_bridge.cxx

@@ -20,6 +20,9 @@
 #include <vcclr.h>
 //ToDo: remove when build with .NET 2
 #pragma warning(push, 1)
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #include "uno/environment.hxx"
 #pragma warning(pop)

cli_ure/source/uno_bridge/cli_data.cxx

@@ -18,7 +18,11 @@
  */
 
 #pragma warning(push, 1)
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include "windows.h"
+#include <ole2.h>
 #pragma warning(pop)
 
 #include <memory>

connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx

@@ -26,6 +26,9 @@
 #endif // End UNIX
 
 #ifdef _WIN32
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #include <stdlib.h>
 #include <shlobj.h>

dbaccess/win32/source/odbcconfig/odbcconfig.cxx

@@ -27,6 +27,9 @@
 #pragma warning(disable:4005)
 #endif
 
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #include <shellapi.h>
 #include <sqlext.h>

desktop/source/app/cmdlinehelp.cxx

@@ -27,6 +27,9 @@
 #include "cmdlinehelp.hxx"
 
 #ifdef _WIN32
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include "windows.h"
 #include "io.h"
 #include "fcntl.h"

desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx

@@ -85,6 +85,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)

desktop/source/deployment/misc/lockfile.cxx

@@ -26,6 +26,9 @@
 #ifndef _WIN32
 #include <unistd.h>
 #else
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #endif
 #include <comphelper/random.hxx>

dtrans/source/win32/clipb/WinClipbImpl.cxx

@@ -31,6 +31,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 <objidl.h>

dtrans/source/win32/clipb/WinClipbImpl.hxx

@@ -30,6 +30,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)

dtrans/source/win32/dtobj/DTransHelper.hxx

@@ -23,7 +23,11 @@
 #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 <objidl.h>
 #if defined _MSC_VER
 #pragma warning(pop)
 #endif

dtrans/source/win32/dtobj/DataFmtTransl.cxx

@@ -33,6 +33,9 @@
 #pragma warning(push,1)
 #pragma warning(disable:4917)
 #endif
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #include <shlobj.h>
 #if defined _MSC_VER

dtrans/source/win32/dtobj/DataFmtTransl.hxx

@@ -29,7 +29,11 @@
 #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 <objidl.h>
 #if defined _MSC_VER
 #pragma warning(pop)
 #endif

dtrans/source/win32/dtobj/Fetc.hxx

@@ -25,7 +25,11 @@
 #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 <objidl.h>
 #if defined _MSC_VER
 #pragma warning(pop)
 #endif

dtrans/source/win32/dtobj/FetcList.hxx

@@ -28,6 +28,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)

dtrans/source/win32/dtobj/FmtFilter.hxx

@@ -27,7 +27,11 @@
 #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 <objidl.h>
 #if defined _MSC_VER
 #pragma warning(pop)
 #endif

dtrans/source/win32/dtobj/XNotifyingDataObject.hxx

@@ -26,8 +26,11 @@
 #if defined _MSC_VER
 #pragma warning(push,1)
 #endif
-#include <objidl.h>
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
+#include <objidl.h>
 #if defined _MSC_VER
 #pragma warning(pop)
 #endif

dtrans/source/win32/dtobj/XTDataObject.cxx

@@ -36,6 +36,9 @@
 #pragma warning(push,1)
 #pragma warning(disable:4917)
 #endif
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #include <shlobj.h>
 #if defined _MSC_VER

dtrans/source/win32/dtobj/XTDataObject.hxx

@@ -30,6 +30,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 <objidl.h>

dtrans/source/win32/ftransl/ftransl.hxx

@@ -31,14 +31,6 @@
 
 #include <vector>
 
-#if defined _MSC_VER
-#pragma warning(push,1)
-#endif
-#include <windows.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
-
 class CDataFormatTranslatorUNO : public
     cppu::WeakImplHelper< css::datatransfer::XDataFormatTranslator,
                           css::lang::XServiceInfo >

dtrans/source/win32/misc/ImplHelper.cxx

@@ -26,6 +26,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)

dtrans/source/win32/misc/ImplHelper.hxx

@@ -26,7 +26,11 @@
 #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 <objidl.h>
 #if defined _MSC_VER
 #pragma warning(pop)
 #endif

embeddedobj/source/msole/platform.h

@@ -28,7 +28,11 @@
 #pragma warning(disable: 4548 4555 4917)
 #endif
 
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include "windows.h"
+#include <ole2.h>
 
 #if defined _MSC_VER
 #pragma warning(pop)

embeddedobj/test/Container1/nativelib/nativeview.c

@@ -19,6 +19,9 @@
 
 #ifdef _WIN32
 
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 // property name to register own window procedure on hwnd
 #define OLD_PROC_KEY "oldwindowproc"

embedserv/source/embed/docholder.cxx

@@ -25,9 +25,13 @@
 #include "intercept.hxx"
 #include "syswinwrapper.hxx"
 #include "iipaobj.hxx"
-
 #include "common.h"
+
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
+
 #include <com/sun/star/awt/XTopWindow.hpp>
 #include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/awt/XView.hpp>

embedserv/source/inc/syswinwrapper.hxx

@@ -20,6 +20,9 @@
 #ifndef INCLUDED_EMBEDSERV_SOURCE_INC_SYSWINWRAPPER_HXX
 #define INCLUDED_EMBEDSERV_SOURCE_INC_SYSWINWRAPPER_HXX
 
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 
 /**

embedserv/source/inprocserv/advisesink.hxx

@@ -24,7 +24,11 @@
 
 #include <memory>
 
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
+#include <objidl.h>
 #include "smartpointer.hxx"
 
 namespace inprocserv {

embedserv/source/inprocserv/inprocembobj.h

@@ -24,6 +24,9 @@
 #pragma warning(disable : 4668)
 #endif
 
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #include <oleidl.h>
 

extensions/test/ole/OleConverterVar1/convTest.cxx

@@ -19,6 +19,9 @@
 
 
 #pragma warning (disable: 4917)
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #include <comdef.h>
 #include <tchar.h>

extensions/test/ole/cpnt/cpnt.cxx

@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #include <atlbase.h>
 #include <stdio.h>

extensions/test/ole/cppToUno/testcppuno.cxx

@@ -19,6 +19,9 @@
 
 
 #pragma warning(disable: 4917)
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #include <comdef.h>
 #include <tchar.h>

fpicker/source/win32/filepicker/FilterContainer.cxx

@@ -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>
 #if defined _MSC_VER
 #pragma warning(pop)

fpicker/source/win32/filepicker/afxres.h

 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #include <dlgs.h>
 

fpicker/source/win32/filepicker/workbench/Test_fps.cxx

@@ -42,6 +42,9 @@
 #include <osl/thread.h>
 
 #include <stdio.h>
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 
 #include "..\FPServiceInfo.hxx"

fpicker/source/win32/folderpicker/workbench/Test_fops.cxx

@@ -37,6 +37,9 @@
 
 #define _WIN32_DCOM
 
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 
 

fpicker/source/win32/misc/WinImplHelper.hxx

@@ -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>
 #if defined _MSC_VER
 #pragma warning(pop)

include/LibreOfficeKit/LibreOfficeKitInit.h

@@ -76,6 +76,9 @@ extern "C"
 
 #else
     #pragma warning(disable:4996)
+    #if !defined WIN32_LEAN_AND_MEAN
+        #define WIN32_LEAN_AND_MEAN
+    #endif
     #include  <windows.h>
     #define TARGET_LIB        "sofficeapp" ".dll"
     #define TARGET_MERGED_LIB "mergedlo" ".dll"

include/comphelper/windowsStart.hxx

@@ -7,6 +7,9 @@
 #define INCLUDED_COMPHELPER_WINSTART_HXX
 
 #ifdef _WIN32
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #endif
 

jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx

@@ -21,6 +21,9 @@
 #ifdef _WIN32
 # include <stdio.h>
 # include <sys/stat.h>
+# if !defined WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+# endif
 # include <windows.h>
 #endif
 

jvmfwk/plugins/sunmajor/pluginlib/util.cxx

@@ -42,6 +42,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)

jvmfwk/source/fwkutil.cxx

@@ -22,6 +22,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)

odk/source/unoapploader/win/unoapploader.c

@@ -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>
 #if defined _MSC_VER
 #pragma warning(pop)

odk/source/unowinreg/win/unowinreg.cxx

@@ -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)

sal/cppunittester/cppunittester.cxx

@@ -18,6 +18,9 @@
  */
 
 #ifdef _WIN32
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #endif
 

sal/osl/w32/file_url.hxx

@@ -29,7 +29,9 @@
 #pragma warning(push,1)
 #endif
 
-#define WINDOWS_LEAN_AND_MEAN
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 
 #ifdef _MSC_VER

sal/qa/osl/file/osl_File.cxx

@@ -32,6 +32,9 @@
 #include <memory>
 
 #ifdef _WIN32
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #endif
 

sal/qa/osl/process/osl_Thread.cxx

@@ -19,6 +19,9 @@
 
 #include <algorithm>
 #ifdef _WIN32
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #else
 #include <unistd.h>

sal/qa/osl/process/osl_process.cxx

@@ -44,6 +44,9 @@
 #endif
 
 #if defined(_WIN32)                     // Windows
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #   include <windows.h>
 #   include <tchar.h>
 #else

sal/qa/osl/security/osl_Security.cxx

@@ -19,6 +19,9 @@
 
 #include <algorithm>
 #ifdef _WIN32
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #undef min
 #endif

sal/qa/rtl/doublelock/rtl_doublelocking.cxx

@@ -34,6 +34,9 @@
 #include <cppunit/plugin/TestPlugIn.h>
 
 #ifdef _WIN32
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #else
 #include <unistd.h>

sal/qa/rtl/uuid/rtl_Uuid.cxx

@@ -29,6 +29,9 @@
 #include <cppunit/plugin/TestPlugIn.h>
 
 #ifdef _WIN32
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #elif defined UNX
 #include <unistd.h>

shell/qa/zip/ziptest.cxx

@@ -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)

testtools/source/performance/ubtest.cxx

@@ -33,6 +33,9 @@
 #include <osl/time.h>
 
 #ifdef SAL_W32
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #else
 #include <sys/times.h>