From 40fe721462df5bedacddc8829cefc3d739cf940f Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Fri, 7 Feb 2020 14:43:42 +0200
Subject: [PATCH] add some more libs to libmerged

and fix a consequent symbol name clash in basctl

Change-Id: Idc836fcbb379e1046a60008391635eb6241b27c7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88188
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 basctl/Library_basctl.mk                       | 4 ++++
 basctl/source/basicide/basidesh.cxx            | 6 ++++--
 solenv/gbuild/extensions/pre_MergedLibsList.mk | 7 +++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk
index acd12b474160..20e00351ef30 100644
--- a/basctl/Library_basctl.mk
+++ b/basctl/Library_basctl.mk
@@ -29,6 +29,10 @@ $(eval $(call gb_Library_set_include,basctl,\
 	-I$(WORKDIR)/SdiTarget/basctl/sdi \
 ))
 
+$(eval $(call gb_Library_add_defs,basctl,\
+    -DENABLE_MERGELIBS=$(if $(MERGELIBS),1,0) \
+))
+
 $(eval $(call gb_Library_use_external,basctl,boost_headers))
 
 $(eval $(call gb_Library_use_custom_headers,basctl,\
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 0b9a2eaf88b8..aa8ae7e364a0 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -43,17 +43,19 @@
 #include <sfx2/viewfrm.hxx>
 #include <svl/srchitem.hxx>
 
-#ifdef DISABLE_DYNLOADING
+#if defined(DISABLE_DYNLOADING) || ENABLE_MERGELIBS
 /* Avoid clash with the ones from svx/source/form/typemap.cxx */
 #define aSfxDocumentInfoItem_Impl basctl_source_basicide_basidesh_aSfxDocumentInfoItem_Impl
+#define aSfxUnoAnyItem_Impl basctl_source_basicide_basidesh_aSfxUnoAnyItem_Impl
 #endif
 
 #define ShellClass_basctl_Shell
 #define SFX_TYPEMAP
 #include <basslots.hxx>
 
-#ifdef DISABLE_DYNLOADING
+#if defined(DISABLE_DYNLOADING) || ENABLE_MERGELIBS
 #undef aSfxDocumentInfoItem_Impl
+#undef aSfxUnoAnyItem_Impl
 #endif
 
 #include <iderdll.hxx>
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 00d9bc57921a..e20cec20344e 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -10,6 +10,9 @@
 # we link all object files from these libraries into one, merged library
 MERGE_LIBRARY_LIST := \
 	avmedia \
+	$(call gb_Helper_optional,SCRIPTING, \
+		basctl \
+	) \
 	basegfx \
 	canvastools \
 	comphelper \
@@ -35,14 +38,18 @@ MERGE_LIBRARY_LIST := \
 	localebe1 \
 	mcnttype \
 	msfilter \
+	mtfrenderer \
 	$(if $(filter OPENCL,$(BUILD_TYPE)),opencl) \
 	package2 \
 	sax \
 	sb \
+	simplecanvas \
 	sfx \
 	sofficeapp \
 	sot \
 	$(if $(DISABLE_GUI),,spl) \
+	$(call gb_Helper_optional,SCRIPTING,stringresource) \
+	stringresource \
 	svl \
 	svt \
 	svx \