diff options
| -rw-r--r-- | idlc/source/astscope.cxx | 9 | ||||
| -rw-r--r-- | offapi/type_reference/typelibrary_history.txt | 2 | ||||
| -rw-r--r-- | offapi/type_reference/types.rdb | bin | 6717440 -> 7077888 bytes | |||
| -rw-r--r-- | pyuno/source/module/pyuno_dlopenwrapper.c | 33 | ||||
| -rw-r--r-- | registry/tools/makefile.mk | 1 |
5 files changed, 35 insertions, 10 deletions
diff --git a/idlc/source/astscope.cxx b/idlc/source/astscope.cxx index f536d9c2b381..12d46f312c03 100644 --- a/idlc/source/astscope.cxx +++ b/idlc/source/astscope.cxx @@ -91,10 +91,11 @@ AstDeclaration* AstScope::addDeclaration(AstDeclaration* pDecl) return pDecl; } if ( (NT_service == m_nodeType) && - ((pDecl->getNodeType() == NT_interface_member) - && (pDeclaration->getNodeType() == NT_interface)) || - ((pDecl->getNodeType() == NT_service_member) - && (pDeclaration->getNodeType() == NT_service))) + ( ((pDecl->getNodeType() == NT_interface_member) + && (pDeclaration->getNodeType() == NT_interface)) || + ((pDecl->getNodeType() == NT_service_member) + && (pDeclaration->getNodeType() == NT_service)) ) + ) { m_declarations.push_back(pDecl); return pDecl; diff --git a/offapi/type_reference/typelibrary_history.txt b/offapi/type_reference/typelibrary_history.txt index 1ab556f14383..14df3766db98 100644 --- a/offapi/type_reference/typelibrary_history.txt +++ b/offapi/type_reference/typelibrary_history.txt @@ -129,3 +129,5 @@ change css.text.IllustrationIndex into css.text.IllustrationsIndex because the implementation used the plural version. +04/12/08 (JSC): TaskID=i96902 + update reference rdb with the released version from OO.org 3.0 (ooo300m9) diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb Binary files differindex 8ad2cc7fa6b3..82e141bda693 100644 --- a/offapi/type_reference/types.rdb +++ b/offapi/type_reference/types.rdb diff --git a/pyuno/source/module/pyuno_dlopenwrapper.c b/pyuno/source/module/pyuno_dlopenwrapper.c index 9a911b56d57f..71ddaaa44f6f 100644 --- a/pyuno/source/module/pyuno_dlopenwrapper.c +++ b/pyuno/source/module/pyuno_dlopenwrapper.c @@ -27,16 +27,37 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ + +#include <rtl/string.h> + +#include <stdlib.h> +#include <string.h> + +#ifdef LINUX +# ifndef __USE_GNU +# define __USE_GNU +# endif +#endif #include <dlfcn.h> -#include <sal/config.h> void initpyuno () { + Dl_info dl_info; void (*func)(void); - void* h = dlopen (SAL_DLLPREFIX "pyuno" SAL_DLLEXTENSION , RTLD_NOW | RTLD_GLOBAL); - if( h ) - { - func = (void (*)())dlsym (h, "initpyuno"); - (func) (); + + if (dladdr((void*)&initpyuno, &dl_info) != 0) { + void* h = 0; + size_t len = strrchr(dl_info.dli_fname, '/') - dl_info.dli_fname + 1; + char* libname = malloc(len + RTL_CONSTASCII_LENGTH( SAL_DLLPREFIX "pyuno" SAL_DLLEXTENSION ) + 1); + strncpy(libname, dl_info.dli_fname, len); + strcpy(libname + (len), SAL_DLLPREFIX "pyuno" SAL_DLLEXTENSION); + + h = dlopen (libname, RTLD_NOW | RTLD_GLOBAL); + free(libname); + if( h ) + { + func = (void (*)())dlsym (h, "initpyuno"); + (func) (); + } } } diff --git a/registry/tools/makefile.mk b/registry/tools/makefile.mk index 134cd483b587..375527b14b09 100644 --- a/registry/tools/makefile.mk +++ b/registry/tools/makefile.mk @@ -66,6 +66,7 @@ APP2STDLIBS=\ APP3TARGET= regcompare APP3OBJS= $(OBJ)$/regcompare.obj +APP3RPATH= SDK APP3STDLIBS=\ $(SALLIB) \ |