diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-02-27 08:58:17 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-02-27 08:58:17 +0000 |
| commit | a3cc5c3d1d7d0b269196286c207f91ca42bad820 (patch) | |
| tree | f84fa504ec5d47a684a179648443ce6b25ab4f7c /bridges/source/cpp_uno/gcc3_linux_sparc | |
| parent | 6322a9028bd01cc18307f5c1507bf7d53ff06c70 (diff) | |
INTEGRATION: CWS ia64port01_DEV300 (1.12.66); FILE MERGED
2008/02/18 10:40:38 cmc 1.12.66.1: #i84999# follow sb's suggested pattern, stage 1, gcc3_linux_*
Diffstat (limited to 'bridges/source/cpp_uno/gcc3_linux_sparc')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx index fbb10effdb2b..b89e90877e60 100644 --- a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx @@ -4,9 +4,9 @@ * * $RCSfile: cpp2uno.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: vg $ $Date: 2006-11-22 11:07:20 $ + * last change: $Author: obo $ $Date: 2008-02-27 09:58:17 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -493,29 +493,37 @@ unsigned char * codeSnippet( } //end of namespace -void ** bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block) +struct bridges::cpp_uno::shared::VtableFactory::Slot { void * fn; }; + +bridges::cpp_uno::shared::VtableFactory::Slot * +bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block) { - return static_cast< void ** >(block) + 2; + return static_cast< Slot * >(block) + 2; } sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize( sal_Int32 slotCount) { - return (slotCount + 2) * sizeof (void *) + slotCount * codeSnippetSize; + return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize; } -void ** bridges::cpp_uno::shared::VtableFactory::initializeBlock(void * block) { - void ** slots = mapBlockToVtable(block); - slots[-2] = 0; //null - slots[-1] = 0; //destructor - return slots; +bridges::cpp_uno::shared::VtableFactory::Slot * +bridges::cpp_uno::shared::VtableFactory::initializeBlock( + void * block, sal_Int32 slotCount) +{ + Slot * slots = mapBlockToVtable(block); + slots[-2].fn = 0; //null + slots[-1].fn = 0; //destructor + return slots + slotCount; } unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( - void ** slots, unsigned char * code, + Slot ** slots, unsigned char * code, typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset, - sal_Int32 /* functionCount */, sal_Int32 vTableOffset) + sal_Int32 functionCount, sal_Int32 vTableOffset) { + (*slots) -= functionCount; + Slot * s = *slots; for (sal_Int32 i = 0; i < type->nMembers; ++i) { typelib_TypeDescription * member = 0; TYPELIB_DANGER_GET(&member, type->ppMembers[i]); @@ -523,7 +531,7 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( switch (member->eTypeClass) { case typelib_TypeClass_INTERFACE_ATTRIBUTE: // Getter: - *slots++ = code; + (s++)->fn = code; code = codeSnippet( code, functionOffset++, vTableOffset, bridges::cpp_uno::shared::isSimpleType( @@ -535,13 +543,13 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( typelib_InterfaceAttributeTypeDescription * >( member)->bReadOnly) { - *slots++ = code; + (s++)->fn = code; code = codeSnippet(code, functionOffset++, vTableOffset, true); } break; case typelib_TypeClass_INTERFACE_METHOD: - *slots++ = code; + (s++)->fn = code; code = codeSnippet( code, functionOffset++, vTableOffset, bridges::cpp_uno::shared::isSimpleType( |