add oox sd and xmlsecurity to Library_merged

Change-Id: Ie9ef511308179902cbaeb2cca39414e86c57ce30

Library_merged.mk

@@ -58,6 +58,7 @@ $(eval $(call gb_Library_use_externals,merged,\
 	lcms2 \
 	libxml2 \
 	nss3 \
+	openssl \
 	$(if $(filter-out IOS,$(OS)),\
 	wpd \
 	wpg \

sd/source/ui/view/viewshe2.cxx

@@ -72,7 +72,7 @@
 
 using namespace com::sun::star;
 
-#ifndef DISABLE_DYNLOADING // otherwise use the one in sw...
+#if !defined(DISABLE_DYNLOADING) && !defined(LIBO_MERGELIBS) // otherwise use the one in sw...
 const String aEmptyStr;
 #endif
 

solenv/gbuild/extensions/pre_MergedLibsList.mk

@@ -49,10 +49,12 @@ gb_MERGEDLIBS := \
 	lng \
 	localebe1 \
 	msfilter \
+	oox \
 	package2 \
 	sax \
 	sb \
 	sc \
+	sd \
 	sfx \
 	sofficeapp \
 	sot \
@@ -73,6 +75,7 @@ gb_MERGEDLIBS := \
 	vcl \
 	$(if $(filter-out IOS,$(OS)),wpftwriter) \
 	xmlscript \
+	xmlsecurity \
 	xo \