From bf608ba386b132398dc75eae1210efd6b007c174 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Tue, 3 Feb 2004 10:56:07 +0000
Subject: [PATCH] INTEGRATION: CWS sb10 (1.2.2); FILE MERGED 2003/12/10
 08:57:03 sb 1.2.2.1: #114000# Adapted to multiple-inheritance interface
 types.

---
 idlc/inc/idlc/errorhandler.hxx | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/idlc/inc/idlc/errorhandler.hxx b/idlc/inc/idlc/errorhandler.hxx
index b176ecb65b7f..81a1e4c9fb73 100644
--- a/idlc/inc/idlc/errorhandler.hxx
+++ b/idlc/inc/idlc/errorhandler.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: errorhandler.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: obo $ $Date: 2003-10-20 13:06:51 $
+ *  last change: $Author: hr $ $Date: 2004-02-03 11:56:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -109,7 +109,6 @@ enum ErrorCode
     EIDL_TYPE_NOT_VALID,    // Type is not valid in this context
     EIDL_INTERFACEMEMBER_LOOKUP,    // interface is not defined or a fwd declaration not exists
     EIDL_SERVICEMEMBER_LOOKUP,
-    EIDL_MULTIBLE_INHERITANCE,  // multible inheritance is not allowed
     EIDL_TYPE_IDENT_CONFLICT,   // type and identifier has equal names
     EIDL_ONEWAY_RAISE_CONFLICT, // oneway function raised excpetion conflict
     EIDL_WRONGATTRIBUTEFLAG,
@@ -117,7 +116,9 @@ enum ErrorCode
     EIDL_WRONGATTRIBUTEKEYWORD,
     EIDL_MISSINGATTRIBUTEKEYWORD,
     EIDL_ATTRIBUTEREADONLYEXPECTED,
-    EIDL_OPTIONALEXPECTED
+    EIDL_OPTIONALEXPECTED,
+    EIDL_MIXED_INHERITANCE,
+    EIDL_DOUBLE_INHERITANCE
 };
 
 enum WarningCode
@@ -161,7 +162,7 @@ public:
     // Report a type error
     void    noTypeError(AstDeclaration* pDecl);
 
-    void    inheritanceError(::rtl::OString* name, AstDeclaration* pDecl);
+    void    inheritanceError(NodeType nodeType, const ::rtl::OString* name, AstDeclaration* pDecl);
 
     void    flagError(ErrorCode e, sal_uInt32 flag);