diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-03 10:58:49 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-03 10:58:49 +0000 |
| commit | 1ff02519070ad60b97eb60ee638755dd99ae50a7 (patch) | |
| tree | eca145419fbfd070ca79d94dec47b5600c8cad61 /idlc/source/astscope.cxx | |
| parent | INTEGRATION: CWS sb10 (1.3.64); FILE MERGED (diff) | |
| download | core-1ff02519070ad60b97eb60ee638755dd99ae50a7.tar.gz core-1ff02519070ad60b97eb60ee638755dd99ae50a7.zip | |
INTEGRATION: CWS sb10 (1.6.20); FILE MERGED
2003/12/10 09:12:19 sb 1.6.20.1: #114000# Adapted to multiple-inheritance interface types.
Diffstat (limited to 'idlc/source/astscope.cxx')
| -rw-r--r-- | idlc/source/astscope.cxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/idlc/source/astscope.cxx b/idlc/source/astscope.cxx index a4a39dd0cf3f..23d45ac15468 100644 --- a/idlc/source/astscope.cxx +++ b/idlc/source/astscope.cxx @@ -2,9 +2,9 @@ * * $RCSfile: astscope.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rt $ $Date: 2003-04-17 09:27:55 $ + * last change: $Author: hr $ $Date: 2004-02-03 11:58:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -383,9 +383,5 @@ AstDeclaration* AstScope::lookupForAdd(AstDeclaration* pDecl) AstDeclaration* pRetDecl = lookupByNameLocal(pDecl->getLocalName()); - if ( (pRetDecl == NULL) && - m_nodeType == NT_interface ) - pRetDecl = lookupInInherited(pDecl->getLocalName()); - return pRetDecl; } |