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
---
 sw/source/ui/dialog/swdialmgr.cxx | 2 +-
 sw/source/ui/dialog/swuiexp.cxx   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'sw')

diff --git a/sw/source/ui/dialog/swdialmgr.cxx b/sw/source/ui/dialog/swdialmgr.cxx
index 5775ed7adf78..fe14678ca42c 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>
 
-#if !defined(DISABLE_DYNLOADING) && !defined (LIBO_MERGELIBS)
+#ifndef DISABLE_DYNLOADING
 //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 ee6231b03c5f..7b92e8928b9c 100644
--- a/sw/source/ui/dialog/swuiexp.cxx
+++ b/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
 
-- 
cgit