From a856966cf480e2751b742f8c65a81e197d28201e Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Fri, 11 Jul 2008 13:50:09 +0000 Subject: 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 --- idlc/source/parser.y | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'idlc/source/parser.y') diff --git a/idlc/source/parser.y b/idlc/source/parser.y index 0055be90f089..09754522fcde 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); -- cgit