diff options
Diffstat (limited to 'basctl/source/basicide/basidesh.cxx')
| -rw-r--r-- | basctl/source/basicide/basidesh.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index 0b9a2eaf88b8..aa8ae7e364a0 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -43,17 +43,19 @@ #include <sfx2/viewfrm.hxx> #include <svl/srchitem.hxx> -#ifdef DISABLE_DYNLOADING +#if defined(DISABLE_DYNLOADING) || ENABLE_MERGELIBS /* Avoid clash with the ones from svx/source/form/typemap.cxx */ #define aSfxDocumentInfoItem_Impl basctl_source_basicide_basidesh_aSfxDocumentInfoItem_Impl +#define aSfxUnoAnyItem_Impl basctl_source_basicide_basidesh_aSfxUnoAnyItem_Impl #endif #define ShellClass_basctl_Shell #define SFX_TYPEMAP #include <basslots.hxx> -#ifdef DISABLE_DYNLOADING +#if defined(DISABLE_DYNLOADING) || ENABLE_MERGELIBS #undef aSfxDocumentInfoItem_Impl +#undef aSfxUnoAnyItem_Impl #endif #include <iderdll.hxx> |