diff options
| author | Mathias Bauer <mba@openoffice.org> | 2002-08-29 13:10:48 +0000 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2002-08-29 13:10:48 +0000 |
| commit | e96d3f9181181a352ad069f8c6c22afa0856bc8e (patch) | |
| tree | 923cd651ebc21af4a3f4ff83d5244406b8fb0d88 /idl | |
| parent | 25d074241f90d847d8241d71b731b6851bea11c0 (diff) | |
#98951#: make sure that slot names are unique
Diffstat (limited to 'idl')
| -rw-r--r-- | idl/source/objects/slot.cxx | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index bc0dc0271ed7..538f7b9feba4 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -2,9 +2,9 @@ * * $RCSfile: slot.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: mba $ $Date: 2002-08-23 11:13:21 $ + * last change: $Author: mba $ $Date: 2002-08-29 14:08:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1014,9 +1014,15 @@ BOOL SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { SetRef( pKnownSlot ); - // Namen d"urfen abweichen, da mit angegeben - DBG_ASSERT( pKnownSlot->GetName() == GetName(), "Name error!"); - SetName( pKnownSlot->GetName(), &rBase ); + // Namen d"urfen abweichen, da mit angegeben + if ( pKnownSlot->GetName() != GetName() ) + { + DBG_ERROR("Illegal definition!"); + rInStm.Seek( nTokPos ); + return FALSE; + } + + SetName( pKnownSlot->GetName(), &rBase ); } else { |