Revert "add fwl, scui, sdui, swui to Library_merged"

This reverts commit 6c8c54ee.

Conflicts:
	solenv/gbuild/extensions/pre_MergedLibsList.mk

Change-Id: I6393507344297990dfcc6e234c7b0e503a8bd10b

sc/source/ui/attrdlg/scuiexp.cxx

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

sd/source/ui/dlg/sduiexp.cxx

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

sw/source/ui/dialog/swdialmgr.cxx

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

sw/source/ui/dialog/swuiexp.cxx

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