Always link with user32

23 files changed, 1 insertions, 47 deletions

diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk
index bb31b3850b16..bf09a03721ee 100644
--- a/avmedia/Library_avmediawin.mk
+++ b/avmedia/Library_avmediawin.mk
@@ -57,7 +57,6 @@ $(eval $(call gb_Library_add_linked_libs,avmediawin,\
 $(eval $(call gb_Library_add_libs,avmediawin,\
 	strmiids.lib \
 	dxguid.lib \
-	user32.lib \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,avmediawin,\
diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk
index 7eb4f6661a87..bcc1ae64675c 100644
--- a/bean/Library_officebean.mk
+++ b/bean/Library_officebean.mk
@@ -46,7 +46,6 @@ endif
 ifeq ($(GUI),WNT)
 
 $(eval $(call gb_Library_add_linked_libs,officebean,\
-    user32 \
     jawt \
 ))
 
diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk
index 3cfa430e753d..d15a0f654af6 100644
--- a/canvas/Library_cairocanvas.mk
+++ b/canvas/Library_cairocanvas.mk
@@ -102,7 +102,6 @@ $(eval $(call gb_Library_add_exception_objects,cairocanvas,\
 ))
 $(eval $(call gb_Library_add_linked_libs,cairocanvas,\
 	gdi32 \
-	user32 \
 ))
 
 else
diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk
index 733eaf1db6cb..8fef474ca807 100644
--- a/canvas/Library_directx9canvas.mk
+++ b/canvas/Library_directx9canvas.mk
@@ -63,7 +63,6 @@ $(eval $(call gb_Library_add_linked_libs,directx9canvas,\
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_add_linked_libs,directx9canvas,\
 	d3d9 \
-	user32 \
 	gdi32 \
 	gdiplus \
 ))
diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk
index c099c98059a0..97357fa259ec 100644
--- a/canvas/Library_gdipluscanvas.mk
+++ b/canvas/Library_gdipluscanvas.mk
@@ -68,7 +68,6 @@ $(eval $(call gb_Library_add_linked_libs,gdipluscanvas,\
 
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_add_linked_libs,gdipluscanvas,\
-	user32 \
 	gdi32 \
 	gdiplus \
 ))
diff --git a/dbaccess/Executable_odbcconfig.mk b/dbaccess/Executable_odbcconfig.mk
index 6e18eb45f21c..e4e665412731 100644
--- a/dbaccess/Executable_odbcconfig.mk
+++ b/dbaccess/Executable_odbcconfig.mk
@@ -48,12 +48,6 @@ $(eval $(call gb_Executable_add_linked_libs,odbcconfig,\
     $(gb_STDLIBS) \
 ))
 
-ifeq ($(OS),WNT)
-$(eval $(call gb_Executable_add_linked_libs,odbcconfig,\
-    user32 \
-))
-endif
-
 $(eval $(call gb_Executable_add_exception_objects,odbcconfig,\
     dbaccess/win32/source/odbcconfig/odbcconfig \
 ))
diff --git a/desktop/Executable_crashrep.com.mk b/desktop/Executable_crashrep.com.mk
index 858ab1094dfa..f62a10270552 100644
--- a/desktop/Executable_crashrep.com.mk
+++ b/desktop/Executable_crashrep.com.mk
@@ -38,10 +38,6 @@ $(eval $(call gb_Executable_add_defs,crashrep_com,\
     $(LFS_CFLAGS) \
 ))
 
-$(eval $(call gb_Executable_add_linked_libs,crashrep_com,\
-    user32 \
-))
-
 $(eval $(call gb_Executable_add_exception_objects,crashrep_com,\
     desktop/win32/source/guistdio/guistdio \
 ))
diff --git a/desktop/Executable_loader2.mk b/desktop/Executable_loader2.mk
index a7ebedc2e86c..ee515009fa92 100644
--- a/desktop/Executable_loader2.mk
+++ b/desktop/Executable_loader2.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_Executable_add_linked_libs,loader2,\
     gdi32 \
     msi \
     shell32 \
-    user32 \
 ))
 
 ifeq ($(COM),MSC)
diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk
index aa6abd32f80f..6db687018132 100644
--- a/desktop/Executable_quickstart.mk
+++ b/desktop/Executable_quickstart.mk
@@ -37,11 +37,9 @@ $(eval $(call gb_Executable_set_include,quickstart,\
 $(eval $(call gb_Executable_add_linked_libs,quickstart,\
     comdlg32 \
     gdi32 \
-    kernel32 \
     ole32 \
     oleaut32 \
     shell32 \
-    user32 \
 ))
 
 ifeq ($(COM),GCC)
diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk
index 3aad85f93573..7731aefd6e1e 100644
--- a/desktop/Executable_soffice.bin.mk
+++ b/desktop/Executable_soffice.bin.mk
@@ -53,10 +53,6 @@ $(eval $(call gb_Executable_add_cobjects,$(sofficebin),\
 
 ifeq ($(OS),WNT)
 
-$(eval $(call gb_Executable_add_linked_libs,$(sofficebin),\
-    user32 \
-))
-
 $(eval $(call gb_Executable_add_linked_static_libs,$(sofficebin),\
     ooopathutils \
 ))
diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk
index 0be0fd373473..8240ef30d38e 100644
--- a/desktop/Executable_soffice.mk
+++ b/desktop/Executable_soffice.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_Executable_add_linked_libs,soffice,\
     advapi32 \
     shell32 \
     shlwapi \
-    user32 \
 ))
 
 $(eval $(call gb_Executable_add_linked_static_libs,soffice,\
diff --git a/desktop/Executable_unopkg.mk b/desktop/Executable_unopkg.mk
index f68ec85c27fc..3703f8cd8639 100644
--- a/desktop/Executable_unopkg.mk
+++ b/desktop/Executable_unopkg.mk
@@ -38,10 +38,6 @@ $(eval $(call gb_Executable_add_linked_static_libs,unopkg,\
     ooopathutils \
 ))
 
-$(eval $(call gb_Executable_add_linked_libs,unopkg,\
-    user32 \
-))
-
 $(eval $(call gb_Executable_add_noexception_objects,unopkg,\
     desktop/win32/source/extendloaderenvironment \
     desktop/win32/source/guiloader/genericloader \
diff --git a/dtrans/Library_dnd.mk b/dtrans/Library_dnd.mk
index 09e71e85349c..36170c1df200 100644
--- a/dtrans/Library_dnd.mk
+++ b/dtrans/Library_dnd.mk
@@ -51,7 +51,6 @@ $(eval $(call gb_Library_add_linked_libs,dnd,\
 	oleaut32 \
 	sal \
 	shell32 \
-	user32 \
 	uuid \
 	uwinapi \
 	$(gb_STDLIBS) \
diff --git a/dtrans/Library_sysdtrans.mk b/dtrans/Library_sysdtrans.mk
index de1843beb7c2..460582b3a868 100644
--- a/dtrans/Library_sysdtrans.mk
+++ b/dtrans/Library_sysdtrans.mk
@@ -57,7 +57,6 @@ $(eval $(call gb_Library_add_linked_libs,sysdtrans,\
 	sal \
 	shell32 \
 	uuid \
-	user32 \
 	uwinapi \
 	$(gb_STDLIBS) \
 ))
diff --git a/hwpfilter/Library_hwp.mk b/hwpfilter/Library_hwp.mk
index 8f47cf59654f..1cfb9210171a 100644
--- a/hwpfilter/Library_hwp.mk
+++ b/hwpfilter/Library_hwp.mk
@@ -54,7 +54,6 @@ ifeq ($(OS),WNT)
 
 $(eval $(call gb_Library_add_linked_libs,hwp,\
     ole32 \
-    user32 \
     uuid \
 ))
 
diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk
index f57673483f71..c82732ade043 100644
--- a/sc/Library_scui.mk
+++ b/sc/Library_scui.mk
@@ -118,10 +118,7 @@ $(eval $(call gb_Library_add_exception_objects,scui,\
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_add_linked_libs,scui,\
 	advapi32 \
-	kernel32 \
-	msvcrt \
 	$(gb_Library_win32_OLDNAMES) \
-	user32 \
 	uwinapi \
 ))
 endif
diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk
index fa7d5972e036..96c57c8080f3 100644
--- a/sc/Library_vbaobj.mk
+++ b/sc/Library_vbaobj.mk
@@ -156,10 +156,7 @@ endif
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_add_linked_libs,vbaobj,\
 	advapi32 \
-	kernel32 \
-	msvcrt \
 	$(gb_Library_win32_OLDNAMES) \
-	user32 \
 	uwinapi \
 ))
 endif
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index afd60a0f8e19..432b4645acad 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -286,7 +286,6 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\
     advapi32 \
     ole32 \
     shell32 \
-    user32 \
     uuid \
 ))
 
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 8d74118f2e80..3dd705748f22 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -391,7 +391,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 		$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))) \
 		$(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_filename,$(lib))) \
 		$(LIBS) \
-		$(if $(filter-out StaticLibrary,$(TARGETTYPE)),$(if $(gb_PRODUCT),,oldnames.lib $(if $(filter libcmtd,$(LINKED_LIBS)),,msvcrtd.lib) msvcprtd.lib kernel32.lib user32.lib)) \
+		$(if $(filter-out StaticLibrary,$(TARGETTYPE)),$(if $(gb_PRODUCT),,oldnames.lib $(if $(filter libcmtd,$(LINKED_LIBS)),,msvcrtd.lib) msvcprtd.lib kernel32.lib) user32.lib) \
 		$(if $(DLLTARGET),-out:$(DLLTARGET) -implib:$(1),-out:$(1)); RC=$$?; rm $${RESPONSEFILE} \
 	$(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) && false; fi) ; exit $$RC)
 endef
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index 6302f3850c52..3c7164ca3153 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -159,10 +159,6 @@ $(eval $(call gb_Library_add_exception_objects,svl,\
     svl/source/svdde/ddesvr \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,svl,\
-    user32 \
-))
-
 else
 $(eval $(call gb_Library_add_exception_objects,svl,\
     svl/unx/source/svdde/ddedummy \
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 7caf93cabe03..19be48869b25 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -290,7 +290,6 @@ $(eval $(call gb_Library_add_linked_libs,svt,\
     gdi32 \
     ole32 \
     oleaut32 \
-    user32 \
     uuid \
 ))
 endif
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 0a79ada1c928..13b18c5d65ac 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -145,7 +145,6 @@ $(eval $(call gb_Library_add_linked_libs,tl,\
     mpr \
     ole32 \
     shell32 \
-    user32 \
     uuid \
 ))
 
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 298699d49a89..f97b256909dd 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -489,14 +489,11 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
     gdi32 \
     gdiplus \
     imm32 \
-    kernel32 \
     mpr \
     msimg32 \
-    msvcrt \
     $(gb_Library_win32_OLDNAMES) \
     ole32 \
     shell32 \
-    user32 \
     uuid \
     uwinapi \
     winspool \