strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS sb10 (1.2.2); FILE MERGED

Browse source 
2003/12/10 08:57:03 sb 1.2.2.1: #114000# Adapted to multiple-inheritance interface types.
This commit is contained in:
Jens-Heiner Rechtien 2004-02-03 10:56:07 +00:00
parent 698c052a5b
commit bf608ba386
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
idlc/inc/idlc/errorhandler.hxx
View file

@ -2,9 +2,9 @@
* *
* $RCSfile: errorhandler.hxx,v $ * $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 * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -109,7 +109,6 @@ enum ErrorCode
EIDL_TYPE_NOT_VALID, // Type is not valid in this context 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_INTERFACEMEMBER_LOOKUP, // interface is not defined or a fwd declaration not exists
EIDL_SERVICEMEMBER_LOOKUP, EIDL_SERVICEMEMBER_LOOKUP,
EIDL_MULTIBLE_INHERITANCE, // multible inheritance is not allowed
EIDL_TYPE_IDENT_CONFLICT, // type and identifier has equal names EIDL_TYPE_IDENT_CONFLICT, // type and identifier has equal names
EIDL_ONEWAY_RAISE_CONFLICT, // oneway function raised excpetion conflict EIDL_ONEWAY_RAISE_CONFLICT, // oneway function raised excpetion conflict
EIDL_WRONGATTRIBUTEFLAG, EIDL_WRONGATTRIBUTEFLAG,
@ -117,7 +116,9 @@ enum ErrorCode
EIDL_WRONGATTRIBUTEKEYWORD, EIDL_WRONGATTRIBUTEKEYWORD,
EIDL_MISSINGATTRIBUTEKEYWORD, EIDL_MISSINGATTRIBUTEKEYWORD,
EIDL_ATTRIBUTEREADONLYEXPECTED, EIDL_ATTRIBUTEREADONLYEXPECTED,
EIDL_OPTIONALEXPECTED EIDL_OPTIONALEXPECTED,
EIDL_MIXED_INHERITANCE,
EIDL_DOUBLE_INHERITANCE
}; };
enum WarningCode enum WarningCode
@ -161,7 +162,7 @@ public:
// Report a type error // Report a type error
void noTypeError(AstDeclaration* pDecl); 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); void flagError(ErrorCode e, sal_uInt32 flag);