diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-07-11 13:49:21 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-11 13:49:21 +0000 |
| commit | 492a63fb0d57eb39e70e3ad7561c8db2afc5436b (patch) | |
| tree | 7148c6ae15ed9bdee87f009f58e27b6e3accf4a9 /idlc | |
| parent | af431133b1cd92ddd3a1b0dcd263f9acbc531bef (diff) | |
INTEGRATION: CWS jsc21 (1.15.56); FILE MERGED
2008/06/20 11:12:53 jsc 1.15.56.3: #i86349# remove unused methods
2008/04/23 09:53:15 jsc 1.15.56.2: RESYNC: (1.15-1.16); FILE MERGED
2008/02/13 14:46:26 jsc 1.15.56.1: #i69326# optional interfaces are now allowed at published serices
Diffstat (limited to 'idlc')
| -rw-r--r-- | idlc/source/errorhandler.cxx | 33 |
1 files changed, 3 insertions, 30 deletions
diff --git a/idlc/source/errorhandler.cxx b/idlc/source/errorhandler.cxx index 66453c068bf8..71f681e31387 100644 --- a/idlc/source/errorhandler.cxx +++ b/idlc/source/errorhandler.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: errorhandler.cxx,v $ - * $Revision: 1.16 $ + * $Revision: 1.17 $ * * This file is part of OpenOffice.org. * @@ -566,33 +566,6 @@ void ErrorHandler::warning0(WarningCode w, const sal_Char* warningmsg) idlc()->incWarningCount(); } -void ErrorHandler::warning1(WarningCode w, AstDeclaration* d) -{ - if ( idlc()->getOptions()->isValid("-w") || idlc()->getOptions()->isValid("-we") ) { - warningHeader(w); - fprintf(stderr, "'%s'\n", d->getScopedName().getStr()); - } - - if ( idlc()->getOptions()->isValid("-we") ) - idlc()->incErrorCount(); - else - idlc()->incWarningCount(); -} - -void ErrorHandler::warning2(WarningCode w, AstDeclaration* d1, AstDeclaration* d2) -{ - if ( idlc()->getOptions()->isValid("-w") || idlc()->getOptions()->isValid("-we") ) { - warningHeader(w); - fprintf(stderr, "'%s', '%s'\n", d1->getScopedName().getStr(), - d2->getScopedName().getStr()); - } - - if ( idlc()->getOptions()->isValid("-we") ) - idlc()->incErrorCount(); - else - idlc()->incWarningCount(); -} - void ErrorHandler::syntaxError(ParseState ps, sal_Int32 lineNumber, const sal_Char* errmsg) { errorHeader(EIDL_SYNTAX_ERROR, lineNumber); @@ -715,8 +688,8 @@ void ErrorHandler::enumValLookupFailure(AstUnion* pUnion, AstEnum* pEnum, const idlc()->incErrorCount(); } -bool ErrorHandler::checkPublished(AstDeclaration const * decl) { - if (idlc()->isPublished() && !decl->isPublished()) { +bool ErrorHandler::checkPublished(AstDeclaration const * decl, bool bOptional) { + if (idlc()->isPublished() && !decl->isPublished() && !bOptional) { error1(EIDL_PUBLISHED_USES_UNPUBLISHED, decl); return false; } else { |