mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add fwl, scui, sdui, swui to Library_merged

Browse Source 
Change-Id: I2aaa67fef4350d60497b891bc93b43a698c12660
This commit is contained in:
Peter Foley
2013-03-26 21:19:56 -04:00
parent 8042b521fd
commit 6c8c54ee90
5 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sc/source/ui/attrdlg/scuiexp.cxx
View File

@@ -36,7 +36,7 @@ namespace scui
} }
} }
#ifdef DISABLE_DYNLOADING #if defined(DISABLE_DYNLOADING) || defined (LIBO_MERGELIBS)
#define CreateDialogFactory ScCreateDialogFactory #define CreateDialogFactory ScCreateDialogFactory
#endif #endif

2
sd/source/ui/dlg/sduiexp.cxx
View File

@@ -20,7 +20,7 @@
#include "sddlgfact.hxx" #include "sddlgfact.hxx"
#include "sal/types.h" #include "sal/types.h"
#ifdef DISABLE_DYNLOADING #if defined(DISABLE_DYNLOADING) || defined (LIBO_MERGELIBS)
#define CreateDialogFactory SdCreateDialogFactory #define CreateDialogFactory SdCreateDialogFactory
#endif #endif

4
solenv/gbuild/extensions/pre_MergedLibsList.mk
View File

@@ -55,6 +55,7 @@ gb_MERGEDLIBS := \
fwe \ fwe \
fwi \ fwi \
fwk \ fwk \
fwl \
i18npool \ i18npool \
i18nutil \ i18nutil \
lng \ lng \
@@ -69,8 +70,10 @@ gb_MERGEDLIBS := \
sax \ sax \
sb \ sb \
sc \ sc \
scui \
scfilt \ scfilt \
sd \ sd \
sdui \
sfx \ sfx \
sofficeapp \ sofficeapp \
sot \ sot \
@@ -81,6 +84,7 @@ gb_MERGEDLIBS := \
svx \ svx \
svxcore \ svxcore \
sw \ sw \
swui \
swd \ swd \
test \ test \
tk \ tk \

2
sw/source/ui/dialog/swdialmgr.cxx
View File

@@ -21,7 +21,7 @@
#include "tools/string.hxx" #include "tools/string.hxx"
#include <sfx2/app.hxx> #include <sfx2/app.hxx>
#ifndef DISABLE_DYNLOADING #if !defined(DISABLE_DYNLOADING) && !defined (LIBO_MERGELIBS)
//copy from core\bastyp\swtypes.cxx //copy from core\bastyp\swtypes.cxx
String aEmptyStr; // constant strings String aEmptyStr; // constant strings

2
sw/source/ui/dialog/swuiexp.cxx
View File

@@ -33,7 +33,7 @@ namespace swui
} }
} }
#ifdef DISABLE_DYNLOADING #if defined(DISABLE_DYNLOADING) || defined (LIBO_MERGELIBS)
#define CreateDialogFactory SwCreateDialogFactory #define CreateDialogFactory SwCreateDialogFactory
#endif #endif