From 756b88f757c45816ac2c59ccd96c59be5df3ee87 Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Mon, 20 Oct 2003 12:08:44 +0000
Subject: [PATCH] INTEGRATION: CWS sdk08 (1.1.74); FILE MERGED 2003/09/16
 13:26:57 jsc 1.1.74.1: #111025# correct identifiers

---
 idlc/test/struct.idl | 90 --------------------------------------------
 idlc/test/union.idl  |  4 +-
 2 files changed, 2 insertions(+), 92 deletions(-)

diff --git a/idlc/test/struct.idl b/idlc/test/struct.idl
index 1b76891a4867..887b45c7859b 100644
--- a/idlc/test/struct.idl
+++ b/idlc/test/struct.idl
@@ -1,66 +1,3 @@
-/*************************************************************************
- *
- *  $RCSfile: struct.idl,v $
- *
- *  $Revision: 1.1 $
- *
- *  last change: $Author: jsc $ $Date: 2001-03-15 12:25:06 $
- *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
- *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
- *
- *  Sun Microsystems Inc., October, 2000
- *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
- *
- *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://www.openoffice.org/license.html.
- *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
- *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
- *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): _______________________________________
- *
- *
- ************************************************************************/
-#ifndef _STRUCT_IDL_
-#define _STRUCT_IDL_
-
 /* In this file the idl struct will be tested.
   bla
  */
@@ -166,32 +103,5 @@ struct TestStruct : BaseStruct
 
 };
 
-//=============================================================================
-
 }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.4  2000/11/08 12:29:00  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:36:18  hjs
-    initial import
-
-    Revision 1.5  2000/09/11 11:53:04  mi
-    documentation merged from XML
-
-    Revision 1.3  2000/03/14 12:36:35  mi
-    #70728# missing documentation
-
-    Revision 1.2  2000/02/07 11:25:05  mi
-    zu #70728# missing documentation marked
-
-    Revision 1.1.1.1  1999/11/11 09:48:46  jsc
-    new
-
-
-=============================================================================*/
-#endif
-
diff --git a/idlc/test/union.idl b/idlc/test/union.idl
index 1401ac06c4ba..8e9b5c5dedf8 100644
--- a/idlc/test/union.idl
+++ b/idlc/test/union.idl
@@ -17,10 +17,10 @@ union UnionTest switch (long) {
 typedef enum E {
   A,
   B
-} E_Alias;
+} EAlias;
 
 // Union with no default label
-union U2 switch(E_Alias) {
+union U2 switch(EAlias) {
   case E::A : long x;
   case E::B : short y;
 };