diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-09 02:28:31 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-09 15:32:30 +0200 |
| commit | b91f836091c2d1b5c9f6ff8a9fe2bd4da5176191 (patch) | |
| tree | fed0549e968f075820e432de88af83c6e21be4f0 | |
| parent | 40800be3816760fe606e7fa8dcf7d3d9ad550257 (diff) | |
Revert "add fwl, scui, sdui, swui to Library_merged"
This reverts commit 6c8c54ee90a2a8d3a8d35b7e89fb39770500936f.
Conflicts:
solenv/gbuild/extensions/pre_MergedLibsList.mk
Change-Id: I6393507344297990dfcc6e234c7b0e503a8bd10b
| -rw-r--r-- | sc/source/ui/attrdlg/scuiexp.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/dlg/sduiexp.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/dialog/swdialmgr.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/dialog/swuiexp.cxx | 2 |
4 files changed, 4 insertions, 4 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 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 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 |