diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-26 21:19:56 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-03-28 09:58:07 -0400 |
| commit | 6c8c54ee90a2a8d3a8d35b7e89fb39770500936f (patch) | |
| tree | 429edebeb085f5013091a6fb64ac495c8dfc1af7 /sw | |
| parent | 8042b521fd5cf71a46256599c84f766c6ae6c621 (diff) | |
add fwl, scui, sdui, swui to Library_merged
Change-Id: I2aaa67fef4350d60497b891bc93b43a698c12660
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/dialog/swdialmgr.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/dialog/swuiexp.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
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 |