From 1ff02519070ad60b97eb60ee638755dd99ae50a7 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Tue, 3 Feb 2004 10:58:49 +0000
Subject: 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.

---
 idlc/source/astscope.cxx | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'idlc/source/astscope.cxx')

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;
 }
-- 
cgit