diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-03 15:43:04 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-03 20:47:58 +0100 |
| commit | 49747ff2337fd1f4a3ee8e16d6328b8dacad99ec (patch) | |
| tree | 110901102d4ae356b161434a4e4064a28a0a738a /dbaccess/source/ui/control | |
| parent | 0981f1d8c8a8918b5f28bf5605023b07e73b0d44 (diff) | |
tdf#120703 PVS: V547 Expression is always true/false
Change-Id: I75082c85862b83ed2503900186ce9c70783e54db
Reviewed-on: https://gerrit.libreoffice.org/62817
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'dbaccess/source/ui/control')
| -rw-r--r-- | dbaccess/source/ui/control/FieldDescControl.cxx | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 4f22d829ff10..5322308e5c83 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -1085,9 +1085,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) m_bAdded = true; } - TOTypeInfoSP pFieldType; - if( pFieldDescr ) - pFieldType = pFieldDescr->getTypeInfo(); + TOTypeInfoSP pFieldType(pFieldDescr->getTypeInfo()); ActivateAggregate( tpColumnName ); ActivateAggregate( tpType ); @@ -1237,19 +1235,17 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) } m_pPreviousType = pFieldType; } - if(pFieldDescr) + + if (pFieldDescr->IsPrimaryKey()) { - if(pFieldDescr->IsPrimaryKey()) - { - DeactivateAggregate( tpRequired ); - } - else if ( !pAutoIncrement && pFieldType.get() ) - { - if ( pFieldType->bNullable ) - ActivateAggregate( tpRequired ); - else - DeactivateAggregate( tpRequired ); - } + DeactivateAggregate(tpRequired); + } + else if (!pAutoIncrement && pFieldType.get()) + { + if (pFieldType->bNullable) + ActivateAggregate(tpRequired); + else + DeactivateAggregate(tpRequired); } // Initialize Controls if( pAutoIncrement ) |