diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-07-11 13:50:09 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-11 13:50:09 +0000 |
| commit | b52b7b7934f235af896b2385dca0eb18e61f14f2 (patch) | |
| tree | 4511867e730e80b4efae6a5d3bb23a8c51c4ae44 /idlc | |
| parent | 31fa3b9af9731a38f9c2452bdcb60ea860e7a021 (diff) | |
INTEGRATION: CWS jsc21 (1.17.38); FILE MERGED
2008/04/23 09:53:08 jsc 1.17.38.2: RESYNC: (1.17-1.18); FILE MERGED
2008/02/13 14:46:26 jsc 1.17.38.1: #i69326# optional interfaces are now allowed at published serices
Diffstat (limited to 'idlc')
| -rw-r--r-- | idlc/source/parser.y | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/idlc/source/parser.y b/idlc/source/parser.y index 0055be90f..09754522f 100644 --- a/idlc/source/parser.y +++ b/idlc/source/parser.y @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: parser.y,v $ - * $Revision: 1.18 $ + * $Revision: 1.19 $ * * This file is part of OpenOffice.org. * @@ -1742,7 +1742,11 @@ service_export : pDecl = pScope->lookupByName(*iter); if ( pDecl && (pDecl->getNodeType() == NT_interface) ) { - if ( idlc()->error()->checkPublished(pDecl) ) + /* we relax the strict published check and allow to add new + * interfaces if they are optional + */ + bool bOptional = (($1 & AF_OPTIONAL) == AF_OPTIONAL); + if ( idlc()->error()->checkPublished(pDecl, bOptional) ) { pIMember = new AstInterfaceMember( $1, (AstInterface*)pDecl, *iter, pScope); |