Always link with user32

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,\

bean/Library_officebean.mk

@@ -46,7 +46,6 @@ endif
 ifeq ($(GUI),WNT)
 
 $(eval $(call gb_Library_add_linked_libs,officebean,\
-    user32 \
     jawt \
 ))
 

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

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

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

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

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

desktop/Executable_loader2.mk

@@ -39,7 +39,6 @@ $(eval $(call gb_Executable_add_linked_libs,loader2,\
     gdi32 \
     msi \
     shell32 \
-    user32 \
 ))
 
 ifeq ($(COM),MSC)

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)

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

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,\

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 \

dtrans/Library_dnd.mk

@@ -51,7 +51,6 @@ $(eval $(call gb_Library_add_linked_libs,dnd,\
 	oleaut32 \
 	sal \
 	shell32 \
-	user32 \
 	uuid \
 	uwinapi \
 	$(gb_STDLIBS) \

dtrans/Library_sysdtrans.mk

@@ -57,7 +57,6 @@ $(eval $(call gb_Library_add_linked_libs,sysdtrans,\
 	sal \
 	shell32 \
 	uuid \
-	user32 \
 	uwinapi \
 	$(gb_STDLIBS) \
 ))

hwpfilter/Library_hwp.mk

@@ -54,7 +54,6 @@ ifeq ($(OS),WNT)
 
 $(eval $(call gb_Library_add_linked_libs,hwp,\
     ole32 \
-    user32 \
     uuid \
 ))
 

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

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

sfx2/Library_sfx.mk

@@ -286,7 +286,6 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\
     advapi32 \
     ole32 \
     shell32 \
-    user32 \
     uuid \
 ))
 

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

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 \

svtools/Library_svt.mk

@@ -290,7 +290,6 @@ $(eval $(call gb_Library_add_linked_libs,svt,\
     gdi32 \
     ole32 \
     oleaut32 \
-    user32 \
     uuid \
 ))
 endif

tools/Library_tl.mk

@@ -145,7 +145,6 @@ $(eval $(call gb_Library_add_linked_libs,tl,\
     mpr \
     ole32 \
     shell32 \
-    user32 \
     uuid \
 ))
 

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 \