diff options
author | jailletc36 <christophe.jaillet@wanadoo.fr> | 2012-11-11 10:42:37 +0100 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2012-11-12 10:58:57 +0000 |
commit | 273a60af9aae1a0b87d2ff43bdfb0cd849b29d27 (patch) | |
tree | 874ebb1484c2ac1e4f20f1bf2bd7f0942f2842be /sc | |
parent | fb9522a229c2d7b45d5d9d6e2c4e27ddfde351cf (diff) |
cppCheck: clarifyCondition
Remove some warnings about:
Boolean result is used in bitwise operation
Suspicious condition (assignment + comparison)
Also reduce scope of a variable.
Change-Id: I553e5a09ed1d6276be61efbbb2c28d165a69af39
Signed-off-by: jailletc36 <christophe.jaillet@wanadoo.fr>
Reviewed-on: https://gerrit.libreoffice.org/1031
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/ui/miscdlgs/acredlin.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index dfc0f93ec620..8a7c09268219 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -402,7 +402,7 @@ SvTreeListEntry* ScAcceptChgDlg::InsertChangeAction( pNewData->nActionNo=pScChangeAction->GetActionNumber(); pNewData->bIsAcceptable=pScChangeAction->IsClickable(); pNewData->bIsRejectable=pScChangeAction->IsRejectable(); - pNewData->bDisabled=!pNewData->bIsAcceptable | bDisabled; + pNewData->bDisabled=!pNewData->bIsAcceptable || bDisabled; pNewData->aDateTime=aDateTime; pNewData->nRow = aRef.aStart.Row(); pNewData->nCol = aRef.aStart.Col(); @@ -579,7 +579,7 @@ SvTreeListEntry* ScAcceptChgDlg::InsertFilteredAction( pNewData->nActionNo=pScChangeAction->GetActionNumber(); pNewData->bIsAcceptable=pScChangeAction->IsClickable(); pNewData->bIsRejectable=pScChangeAction->IsRejectable(); - pNewData->bDisabled=!pNewData->bIsAcceptable | bDisabled; + pNewData->bDisabled=!pNewData->bIsAcceptable || bDisabled; pNewData->aDateTime=aDateTime; pNewData->nRow = aRef.aStart.Row(); pNewData->nCol = aRef.aStart.Col(); |