diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-06-03 14:08:41 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-06-03 14:08:41 +0000 |
| commit | b7ca4cb9603db7f25df3471881c4a6abba993e62 (patch) | |
| tree | 03844cd3ca55f217015529eeb99610b3e65faf89 /idlc/source/astscope.cxx | |
| parent | 954c12f9bb7f4e33a004d200e1862a0762ae87d6 (diff) | |
INTEGRATION: CWS sb18 (1.8.4); FILE MERGED
2004/04/21 15:55:11 sb 1.8.4.2: #i21150# Cleaned up nomenclature of polymorphic struct types.
2004/04/08 14:37:16 sb 1.8.4.1: #i21150# Fixed UNOIDL typedef support; initial support for polymorphic struct types.
Diffstat (limited to 'idlc/source/astscope.cxx')
| -rw-r--r-- | idlc/source/astscope.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/idlc/source/astscope.cxx b/idlc/source/astscope.cxx index 244be71a3515..5f4a6a48d88e 100644 --- a/idlc/source/astscope.cxx +++ b/idlc/source/astscope.cxx @@ -2,9 +2,9 @@ * * $RCSfile: astscope.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: rt $ $Date: 2004-03-30 16:45:53 $ + * last change: $Author: obo $ $Date: 2004-06-03 15:08:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -111,7 +111,9 @@ AstDeclaration* AstScope::addDeclaration(AstDeclaration* pDecl) return NULL; } if ( (pDecl->getNodeType() == pDeclaration->getNodeType()) && - ((pDecl->getNodeType() == NT_sequence) || (pDeclaration->getNodeType() == NT_array)) ) + (pDecl->getNodeType() == NT_sequence + || pDecl->getNodeType() == NT_array + || pDecl->getNodeType() == NT_instantiated_struct) ) { return pDeclaration; } @@ -289,9 +291,10 @@ AstDeclaration* AstScope::lookupInInherited(const OString& scopedName) const pInterface->getAllInheritedInterfaces().end()); while ( iter != end ) { - if ( pDecl = iter->getInterface()->lookupByNameLocal(scopedName) ) + AstInterface const * resolved = iter->getResolved(); + if ( pDecl = resolved->lookupByNameLocal(scopedName) ) return pDecl; - if ( pDecl = iter->getInterface()->lookupInInherited(scopedName) ) + if ( pDecl = resolved->lookupInInherited(scopedName) ) return pDecl; ++iter; } |