add fwl, scui, sdui, swui to Library_merged

Change-Id: I2aaa67fef4350d60497b891bc93b43a698c12660

sc/source/ui/attrdlg/scuiexp.cxx

@@ -36,7 +36,7 @@ namespace scui
     }
 }
 
-#ifdef DISABLE_DYNLOADING
+#if defined(DISABLE_DYNLOADING) || defined (LIBO_MERGELIBS)
 #define CreateDialogFactory ScCreateDialogFactory
 #endif
 

sd/source/ui/dlg/sduiexp.cxx

@@ -20,7 +20,7 @@
 #include "sddlgfact.hxx"
 #include "sal/types.h"
 
-#ifdef DISABLE_DYNLOADING
+#if defined(DISABLE_DYNLOADING) || defined (LIBO_MERGELIBS)
 #define CreateDialogFactory SdCreateDialogFactory
 #endif
 

solenv/gbuild/extensions/pre_MergedLibsList.mk

@@ -55,6 +55,7 @@ gb_MERGEDLIBS := \
 	fwe \
 	fwi \
 	fwk \
+	fwl \
 	i18npool \
 	i18nutil \
 	lng \
@@ -69,8 +70,10 @@ gb_MERGEDLIBS := \
 	sax \
 	sb \
 	sc \
+	scui \
 	scfilt \
 	sd \
+	sdui \
 	sfx \
 	sofficeapp \
 	sot \
@@ -81,6 +84,7 @@ gb_MERGEDLIBS := \
 	svx \
 	svxcore \
 	sw \
+	swui \
 	swd \
 	test \
 	tk \

sw/source/ui/dialog/swdialmgr.cxx

@@ -21,7 +21,7 @@
 #include "tools/string.hxx"
 #include <sfx2/app.hxx>
 
-#ifndef DISABLE_DYNLOADING
+#if !defined(DISABLE_DYNLOADING) && !defined (LIBO_MERGELIBS)
 //copy from core\bastyp\swtypes.cxx
 String aEmptyStr; // constant strings
 

sw/source/ui/dialog/swuiexp.cxx

@@ -33,7 +33,7 @@ namespace swui
     }
 }
 
-#ifdef DISABLE_DYNLOADING
+#if defined(DISABLE_DYNLOADING) || defined (LIBO_MERGELIBS)
 #define CreateDialogFactory SwCreateDialogFactory
 #endif