diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 02:48:07 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 02:48:07 +0000 |
| commit | bb434f4df6b5ad0343ff26bc18db9042a41708e1 (patch) | |
| tree | b6ac7d0d0728eb765c8e716df8a9e1b86a272e6f /idlc | |
| parent | 740dba21a8877ea0fba79888bdb5bd10f116213e (diff) | |
INTEGRATION: CWS warnings01 (1.6.12); FILE MERGED
2005/11/21 16:28:40 sb 1.6.12.3: #i53898# Made code warning-free.
2005/09/23 00:05:21 sb 1.6.12.2: RESYNC: (1.6-1.7); FILE MERGED
2005/09/05 12:26:06 sb 1.6.12.1: #i53898# Made code warning-free.
Diffstat (limited to 'idlc')
| -rw-r--r-- | idlc/source/astunion.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/idlc/source/astunion.cxx b/idlc/source/astunion.cxx index b0d443bf9930..6c1f7f38899a 100644 --- a/idlc/source/astunion.cxx +++ b/idlc/source/astunion.cxx @@ -4,9 +4,9 @@ * * $RCSfile: astunion.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2005-09-07 18:09:46 $ + * last change: $Author: hr $ $Date: 2006-06-20 03:48:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -182,8 +182,9 @@ AstUnionBranch* AstUnion::lookupLabel(AstUnionBranch* pBranch) if ( !pLabel->getLabelValue() ) return pBranch; // pLabel->getLabelValue()->setExprValue(pLabel->getLabelValue()->coerce(m_discExprType, sal_False)); - AstExprValue* pLabelValue = NULL; - if ( !(pLabelValue = pLabel->getLabelValue()->coerce(m_discExprType, sal_False)) ) + AstExprValue* pLabelValue = pLabel->getLabelValue()->coerce( + m_discExprType, sal_False); + if ( !pLabelValue ) { idlc()->error()->evalError(pLabel->getLabelValue()); return pBranch; @@ -237,7 +238,7 @@ AstUnionBranch* AstUnion::lookupEnum(AstUnionBranch* pBranch) */ if ( pExpr->getCombOperator() != EC_symbol) { - idlc()->error()->enumValExpected(this, pLabel); + idlc()->error()->enumValExpected(this); return pBranch; } |