From 6c8c54ee90a2a8d3a8d35b7e89fb39770500936f Mon Sep 17 00:00:00 2001
From: Peter Foley <pefoley2@verizon.net>
Date: Tue, 26 Mar 2013 21:19:56 -0400
Subject: [PATCH] add fwl, scui, sdui, swui to Library_merged

Change-Id: I2aaa67fef4350d60497b891bc93b43a698c12660
---
 sc/source/ui/attrdlg/scuiexp.cxx               | 2 +-
 sd/source/ui/dlg/sduiexp.cxx                   | 2 +-
 solenv/gbuild/extensions/pre_MergedLibsList.mk | 4 ++++
 sw/source/ui/dialog/swdialmgr.cxx              | 2 +-
 sw/source/ui/dialog/swuiexp.cxx                | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/sc/source/ui/attrdlg/scuiexp.cxx b/sc/source/ui/attrdlg/scuiexp.cxx
index 77e5b2e9f2ea..93374349fed8 100644
--- a/sc/source/ui/attrdlg/scuiexp.cxx
+++ b/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
 
diff --git a/sd/source/ui/dlg/sduiexp.cxx b/sd/source/ui/dlg/sduiexp.cxx
index d1a64e596486..f3d935ed63f2 100644
--- a/sd/source/ui/dlg/sduiexp.cxx
+++ b/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
 
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index a9f236584fca..c416e6cbeb12 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/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 \
diff --git a/sw/source/ui/dialog/swdialmgr.cxx b/sw/source/ui/dialog/swdialmgr.cxx
index fe14678ca42c..5775ed7adf78 100644
--- a/sw/source/ui/dialog/swdialmgr.cxx
+++ b/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
 
diff --git a/sw/source/ui/dialog/swuiexp.cxx b/sw/source/ui/dialog/swuiexp.cxx
index 7b92e8928b9c..ee6231b03c5f 100644
--- a/sw/source/ui/dialog/swuiexp.cxx
+++ b/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