summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2013-04-09 02:28:31 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2013-04-09 15:32:30 +0200
commitb91f836091c2d1b5c9f6ff8a9fe2bd4da5176191 (patch)
treefed0549e968f075820e432de88af83c6e21be4f0 /sc
parent40800be3816760fe606e7fa8dcf7d3d9ad550257 (diff)
Revert "add fwl, scui, sdui, swui to Library_merged"
This reverts commit 6c8c54ee90a2a8d3a8d35b7e89fb39770500936f. Conflicts: solenv/gbuild/extensions/pre_MergedLibsList.mk Change-Id: I6393507344297990dfcc6e234c7b0e503a8bd10b
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/attrdlg/scuiexp.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/ui/attrdlg/scuiexp.cxx b/sc/source/ui/attrdlg/scuiexp.cxx
index 93374349fed8..77e5b2e9f2ea 100644
--- a/sc/source/ui/attrdlg/scuiexp.cxx
+++ b/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