From 396c9dd4a40c2e64774c34bb661ef75bfb235af6 Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Tue, 20 May 2025 14:24:46 +0200 Subject: [PATCH] don't add 64bit activex component to 32bit builds anymore makefile stuff anymore, there's still code that can be removed from the actual code (partly reverting 8f6b5370be6fe558f6658a0b0719ed64eb205212 that added support for using 64bit Internet Explorer with 32bit Office Change-Id: Id0c59e2ef2f4c87a04f18ea54ed04f4337ea6c73 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185564 Reviewed-by: Christian Lohmaier Tested-by: Jenkins --- Repository.mk | 6 --- extensions/CustomTarget_so_activex_x64.mk | 25 ---------- extensions/Library_so_activex_x64.mk | 56 ----------------------- extensions/Module_extensions.mk | 6 --- scp2/AutoInstall.mk | 1 - scp2/InstallModule_activex.mk | 1 - scp2/source/activex/module_activex.scp | 4 +- 7 files changed, 1 insertion(+), 98 deletions(-) delete mode 100644 extensions/CustomTarget_so_activex_x64.mk delete mode 100644 extensions/Library_so_activex_x64.mk diff --git a/Repository.mk b/Repository.mk index 9543dcd4746c..976cc8090db1 100644 --- a/Repository.mk +++ b/Repository.mk @@ -728,12 +728,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activex, \ so_activex \ )) -ifneq ($(BUILD_X64),) -$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activexwin64, \ - so_activex_x64 \ -)) -endif - $(eval $(call gb_Helper_register_executables_for_install,OOO,spsuppfiles, \ spsupp_helper \ )) diff --git a/extensions/CustomTarget_so_activex_x64.mk b/extensions/CustomTarget_so_activex_x64.mk deleted file mode 100644 index a91a114b52ff..000000000000 --- a/extensions/CustomTarget_so_activex_x64.mk +++ /dev/null @@ -1,25 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_CustomTarget_CustomTarget,extensions/source/activex)) - -$(call gb_CustomTarget_get_target,extensions/source/activex) : \ - $(gb_CustomTarget_workdir)/extensions/source/activex/SOActionsApproval.cxx \ - $(gb_CustomTarget_workdir)/extensions/source/activex/SOActiveX.cxx \ - $(gb_CustomTarget_workdir)/extensions/source/activex/SOComWindowPeer.cxx \ - $(gb_CustomTarget_workdir)/extensions/source/activex/SODispatchInterceptor.cxx \ - $(gb_CustomTarget_workdir)/extensions/source/activex/StdAfx2.cxx \ - $(gb_CustomTarget_workdir)/extensions/source/activex/so_activex.cxx \ - -$(gb_CustomTarget_workdir)/extensions/source/activex/% : \ - $(SRCDIR)/extensions/source/activex/% \ - | $(gb_CustomTarget_workdir)/extensions/source/activex/.dir - cp $< $@ - -# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk deleted file mode 100644 index 047c1044f86e..000000000000 --- a/extensions/Library_so_activex_x64.mk +++ /dev/null @@ -1,56 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# - -$(eval $(call gb_Library_Library,so_activex_x64)) - -$(eval $(call gb_Library_set_x64,so_activex_x64,YES)) - -$(eval $(call gb_Library_use_custom_headers,so_activex_x64,extensions/source/activex/idl)) - -$(eval $(call gb_Library_set_include,so_activex_x64,\ - $$(INCLUDE) \ - -I$(SRCDIR)/extensions/source/activex \ - $(foreach i,$(ATL_INCLUDE), -I$(i)) \ -)) - -$(eval $(call gb_Library_use_sdk_api,so_activex_x64)) - -$(eval $(call gb_Library_add_nativeres,so_activex_x64,so_activex)) - -$(eval $(call gb_Library_add_x64_generated_exception_objects,so_activex_x64,\ - CustomTarget/extensions/source/activex/so_activex \ - CustomTarget/extensions/source/activex/SOActiveX \ - CustomTarget/extensions/source/activex/SOComWindowPeer \ - CustomTarget/extensions/source/activex/SODispatchInterceptor \ - CustomTarget/extensions/source/activex/SOActionsApproval \ - CustomTarget/extensions/source/activex/StdAfx2 \ -)) - -$(eval $(call gb_Library_add_ldflags,so_activex_x64,\ - /DEF:$(SRCDIR)/extensions/source/activex/so_activex.def \ - -LIBPATH:$(ATL_LIB)/amd64 \ -)) - -$(eval $(call gb_Library_use_system_win32_libs,so_activex_x64,\ - advapi32 \ - gdi32 \ - ole32 \ - oleaut32 \ - shlwapi \ - urlmon \ - uuid \ -)) - -$(eval $(call gb_Library_add_libs,so_activex_x64,\ - $(subst /x86,/x64,$(ATL_LIB)/atls.lib)) \ -) - -# vim:set noet sw=4 ts=4: diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index 9d415ea8c8c4..d353db855cff 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -84,12 +84,6 @@ $(eval $(call gb_Module_add_targets,extensions,\ CustomTarget_so_activex_idl \ )) -ifeq ($(BUILD_X64),TRUE) -$(eval $(call gb_Module_add_targets,extensions,\ - CustomTarget_so_activex_x64 \ - Library_so_activex_x64 \ -)) -endif # BUILD_X64 endif # COM=MSC $(eval $(call gb_Module_add_targets,extensions,\ diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index e07de841357f..185300406dc8 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -11,7 +11,6 @@ $(eval $(call gb_AutoInstall_AutoInstall)) $(eval $(call gb_AutoInstall_add_module,activexbinarytable,LIBO_LIB_FILE_BINARYTABLE)) $(eval $(call gb_AutoInstall_add_module,activex,LIBO_LIB_FILE)) -$(eval $(call gb_AutoInstall_add_module,activexwin64,LIBO_LIB_FILE_COMPONENTCONDITION,,,,"VersionNT64")) $(eval $(call gb_AutoInstall_add_module,base,LIBO_LIB_FILE,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,base_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST)) $(eval $(call gb_AutoInstall_add_module,brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST)) diff --git a/scp2/InstallModule_activex.mk b/scp2/InstallModule_activex.mk index ea9b4731313b..b375b37cfc40 100644 --- a/scp2/InstallModule_activex.mk +++ b/scp2/InstallModule_activex.mk @@ -12,7 +12,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/activex)) $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/activex,\ activexbinarytable \ activex \ - activexwin64 \ )) $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/activex,\ diff --git a/scp2/source/activex/module_activex.scp b/scp2/source/activex/module_activex.scp index 2f6645593b96..4bcfe848ff99 100644 --- a/scp2/source/activex/module_activex.scp +++ b/scp2/source/activex/module_activex.scp @@ -20,7 +20,6 @@ #include "AutoInstall/activexbinarytable" #include "AutoInstall/activex" -#include "AutoInstall/activexwin64" Module gid_Module_Optional_Activexcontrol PackageInfo = "packinfo_office.txt"; @@ -29,6 +28,5 @@ Module gid_Module_Optional_Activexcontrol Default = NO; ParentID = gid_Module_Optional; Files = (auto_activexbinarytable_ALL, - auto_activex_ALL, - auto_activexwin64_ALL); + auto_activex_ALL); End