summaryrefslogtreecommitdiffstats
path: root/idlc/source/astunion.cxx
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2004-06-03 14:09:35 +0000
committerOliver Bolte <obo@openoffice.org>2004-06-03 14:09:35 +0000
commitaf8aa590b7c65f81fe1bec69568fd623a095d5a7 (patch)
tree533b2ba0cbc20f6d5a05fa4a69336481dacf978d /idlc/source/astunion.cxx
parentINTEGRATION: CWS sb18 (1.1.2); FILE ADDED (diff)
downloadcore-af8aa590b7c65f81fe1bec69568fd623a095d5a7.tar.gz
core-af8aa590b7c65f81fe1bec69568fd623a095d5a7.zip
INTEGRATION: CWS sb18 (1.4.4); FILE MERGED
2004/05/18 15:36:50 sb 1.4.4.2: #i21150# Added new feature: published. 2004/04/08 14:37:16 sb 1.4.4.1: #i21150# Fixed UNOIDL typedef support; initial support for polymorphic struct types.
Diffstat (limited to 'idlc/source/astunion.cxx')
-rw-r--r--idlc/source/astunion.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/idlc/source/astunion.cxx b/idlc/source/astunion.cxx
index 05705a1fc704..63e6c7f3b734 100644
--- a/idlc/source/astunion.cxx
+++ b/idlc/source/astunion.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: astunion.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: rt $ $Date: 2004-03-30 16:46:21 $
+ * last change: $Author: obo $ $Date: 2004-06-03 15:09:35 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -249,7 +249,7 @@ AstUnionBranch* AstUnion::lookupLabel(AstUnionBranch* pBranch)
AstUnionBranch* AstUnion::lookupEnum(AstUnionBranch* pBranch)
{
- AstType const * pType = resolveTypedefs(m_pDiscriminantType);
+ AstDeclaration const * pType = resolveTypedefs(m_pDiscriminantType);
if ( pType->getNodeType() != NT_enum )
return NULL;
@@ -324,8 +324,8 @@ sal_Bool AstUnion::dump(RegistryKey& rKey)
typereg::Writer aBlob(
TYPEREG_VERSION_0, getDocumentation(),
OStringToOUString(getFileName(), RTL_TEXTENCODING_UTF8), RT_TYPE_UNION,
- OStringToOUString(getRelativName(), RTL_TEXTENCODING_UTF8), 1, nMember,
- 0, 0);
+ false, OStringToOUString(getRelativName(), RTL_TEXTENCODING_UTF8), 1,
+ nMember, 0, 0);
aBlob.setSuperTypeName(
0,
OStringToOUString(