From b91f836091c2d1b5c9f6ff8a9fe2bd4da5176191 Mon Sep 17 00:00:00 2001
From: Matúš Kukan <matus.kukan@gmail.com>
Date: Tue, 9 Apr 2013 02:28:31 +0200
Subject: Revert "add fwl, scui, sdui, swui to Library_merged"

This reverts commit 6c8c54ee90a2a8d3a8d35b7e89fb39770500936f.

Conflicts:
	solenv/gbuild/extensions/pre_MergedLibsList.mk

Change-Id: I6393507344297990dfcc6e234c7b0e503a8bd10b
---
 sd/source/ui/dlg/sduiexp.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sd')

diff --git a/sd/source/ui/dlg/sduiexp.cxx b/sd/source/ui/dlg/sduiexp.cxx
index f3d935ed63f2..d1a64e596486 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"
 
-#if defined(DISABLE_DYNLOADING) || defined (LIBO_MERGELIBS)
+#ifdef DISABLE_DYNLOADING
 #define CreateDialogFactory SdCreateDialogFactory
 #endif
 
-- 
cgit