diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-06 10:12:29 +0300 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-10 12:23:42 +0100 |
commit | 065edb4c8e91170017df482843d0c3eb8d4db114 (patch) | |
tree | 1d030ec9868a56b375a563c9d6e6d81c6115d717 /cui | |
parent | 0b34a5dd39e177ba99cd21b639d67ac8123b8458 (diff) |
tdf#120703 PVS: V547 Expression is always true/false
Change-Id: I0b3c407331bfa1fa0c5003250d327d4f26de3643
Reviewed-on: https://gerrit.libreoffice.org/63235
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/dialogs/srchxtra.cxx | 3 | ||||
-rw-r--r-- | cui/source/tabpages/textanim.cxx | 155 | ||||
-rw-r--r-- | cui/source/tabpages/textattr.cxx | 37 |
3 files changed, 61 insertions, 134 deletions
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index 08a403dd063d..a63691256f19 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -82,8 +82,7 @@ void SvxSearchFormatDialog::PageCreated(const OString& rId, SfxTabPage& rPage) pList = m_pFontList.get(); } - if ( pList ) - static_cast<SvxCharNamePage&>(rPage). + static_cast<SvxCharNamePage&>(rPage). SetFontList( SvxFontListItem( pList, SID_ATTR_CHAR_FONTLIST ) ); static_cast<SvxCharNamePage&>(rPage).EnableSearchMode(); } diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index d5e27cfc2113..7a73a7d91ead 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -143,31 +143,17 @@ void SvxTextAnimationPage::Reset( const SfxItemSet* rAttrs ) if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_ANIKIND ); - if( pItem ) - { - eAniKind = static_cast<const SdrTextAniKindItem*>(pItem)->GetValue(); - m_xLbEffect->set_active( sal::static_int_cast< sal_Int32 >(eAniKind) ); - } - else - m_xLbEffect->set_active(-1); + + eAniKind = static_cast<const SdrTextAniKindItem*>(pItem)->GetValue(); + m_xLbEffect->set_active(sal::static_int_cast<sal_Int32>(eAniKind)); m_xLbEffect->save_value(); // animation direction pItem = GetItem( *rAttrs, SDRATTR_TEXT_ANIDIRECTION ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_ANIDIRECTION ); - if( pItem ) - { - SdrTextAniDirection eValue = static_cast<const SdrTextAniDirectionItem*>(pItem)->GetValue(); - SelectDirection( eValue ); - } - else - { - m_xBtnUp->set_active( false ); - m_xBtnLeft->set_active( false ); - m_xBtnRight->set_active( false ); - m_xBtnDown->set_active( false ); - } + + SelectDirection(static_cast<const SdrTextAniDirectionItem*>(pItem)->GetValue()); m_aUpState = m_xBtnUp->get_state(); m_aLeftState = m_xBtnLeft->get_state(); m_aRightState = m_xBtnRight->get_state(); @@ -177,66 +163,46 @@ void SvxTextAnimationPage::Reset( const SfxItemSet* rAttrs ) pItem = GetItem( *rAttrs, SDRATTR_TEXT_ANISTARTINSIDE ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_ANISTARTINSIDE ); - if( pItem ) - { - m_xTsbStartInside->set_inconsistent(false); - bool bValue = static_cast<const SdrTextAniStartInsideItem*>(pItem)->GetValue(); - if( bValue ) - m_xTsbStartInside->set_state( TRISTATE_TRUE ); - else - m_xTsbStartInside->set_state( TRISTATE_FALSE ); - } + + if (static_cast<const SdrTextAniStartInsideItem*>(pItem)->GetValue()) + m_xTsbStartInside->set_state(TRISTATE_TRUE); else - m_xTsbStartInside->set_state( TRISTATE_INDET ); + m_xTsbStartInside->set_state(TRISTATE_FALSE); m_xTsbStartInside->save_state(); // Stop inside pItem = GetItem( *rAttrs, SDRATTR_TEXT_ANISTOPINSIDE ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_ANISTOPINSIDE ); - if( pItem ) - { - m_xTsbStopInside->set_inconsistent(false); - bool bValue = static_cast<const SdrTextAniStopInsideItem*>(pItem)->GetValue(); - if( bValue ) - m_xTsbStopInside->set_state( TRISTATE_TRUE ); - else - m_xTsbStopInside->set_state( TRISTATE_FALSE ); - } + + if (static_cast<const SdrTextAniStopInsideItem*>(pItem)->GetValue()) + m_xTsbStopInside->set_state(TRISTATE_TRUE); else - m_xTsbStopInside->set_state( TRISTATE_INDET ); + m_xTsbStopInside->set_state(TRISTATE_FALSE); m_xTsbStopInside->save_state(); // quantity pItem = GetItem( *rAttrs, SDRATTR_TEXT_ANICOUNT ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_ANICOUNT ); - if( pItem ) + + long nValue = static_cast<long>(static_cast<const SdrTextAniCountItem*>(pItem)->GetValue()); + m_xNumFldCount->set_value(nValue); + if (nValue == 0) { - m_xTsbEndless->set_inconsistent(false); - long nValue = static_cast<long>(static_cast<const SdrTextAniCountItem*>(pItem)->GetValue()); - m_xNumFldCount->set_value(nValue); - if( nValue == 0 ) + if (eAniKind == SdrTextAniKind::Slide) { - if( eAniKind == SdrTextAniKind::Slide ) - { - m_xTsbEndless->set_state( TRISTATE_FALSE ); - m_xTsbEndless->set_sensitive(false); - } - else - { - m_xTsbEndless->set_state( TRISTATE_TRUE ); - m_xNumFldCount->set_text(""); - } + m_xTsbEndless->set_state(TRISTATE_FALSE); + m_xTsbEndless->set_sensitive(false); } else - m_xTsbEndless->set_state( TRISTATE_FALSE ); + { + m_xTsbEndless->set_state(TRISTATE_TRUE); + m_xNumFldCount->set_text(""); + } } else - { - m_xNumFldCount->set_text(""); - m_xTsbEndless->set_state( TRISTATE_INDET ); - } + m_xTsbEndless->set_state(TRISTATE_FALSE); m_xTsbEndless->save_state(); m_xNumFldCount->save_value(); @@ -244,24 +210,16 @@ void SvxTextAnimationPage::Reset( const SfxItemSet* rAttrs ) pItem = GetItem( *rAttrs, SDRATTR_TEXT_ANIDELAY ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_ANIDELAY ); - if( pItem ) - { - m_xTsbAuto->set_inconsistent(false); - long nValue = static_cast<long>(static_cast<const SdrTextAniDelayItem*>(pItem)->GetValue()); - m_xMtrFldDelay->set_value(nValue, FieldUnit::NONE); - if( nValue == 0 ) - { - m_xTsbAuto->set_state( TRISTATE_TRUE ); - m_xMtrFldDelay->set_text(""); - } - else - m_xTsbAuto->set_state( TRISTATE_FALSE ); - } - else + + nValue = static_cast<long>(static_cast<const SdrTextAniDelayItem*>(pItem)->GetValue()); + m_xMtrFldDelay->set_value(nValue, FieldUnit::NONE); + if (nValue == 0) { + m_xTsbAuto->set_state(TRISTATE_TRUE); m_xMtrFldDelay->set_text(""); - m_xTsbAuto->set_state( TRISTATE_INDET ); } + else + m_xTsbAuto->set_state(TRISTATE_FALSE); m_xTsbAuto->save_state(); m_xMtrFldDelay->save_value(); @@ -269,40 +227,31 @@ void SvxTextAnimationPage::Reset( const SfxItemSet* rAttrs ) pItem = GetItem( *rAttrs, SDRATTR_TEXT_ANIAMOUNT ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_ANIAMOUNT ); - if( pItem ) - { - m_xTsbPixel->set_inconsistent(false); - long nValue = static_cast<long>(static_cast<const SdrTextAniAmountItem*>(pItem)->GetValue()); - if( nValue <= 0 ) - { - m_xTsbPixel->set_state( TRISTATE_TRUE ); - nValue = -nValue; - if( nValue == 0 ) - nValue++; - m_xMtrFldAmount->set_unit( FieldUnit::CUSTOM ); - m_xMtrFldAmount->set_digits(0); - - m_xMtrFldAmount->set_increments(1, 10, FieldUnit::NONE); - m_xMtrFldAmount->set_range(1, 100, FieldUnit::NONE); - m_xMtrFldAmount->set_value(nValue, FieldUnit::NONE); - } - else - { - m_xTsbPixel->set_state( TRISTATE_FALSE ); - m_xMtrFldAmount->set_unit( eFUnit ); - m_xMtrFldAmount->set_digits(2); - m_xMtrFldAmount->set_increments(10, 100, FieldUnit::NONE); - m_xMtrFldAmount->set_range(1, 10000, FieldUnit::NONE); + nValue = static_cast<long>(static_cast<const SdrTextAniAmountItem*>(pItem)->GetValue()); + if (nValue <= 0) + { + m_xTsbPixel->set_state(TRISTATE_TRUE); + nValue = -nValue; + if (nValue == 0) + nValue++; + m_xMtrFldAmount->set_unit(FieldUnit::CUSTOM); + m_xMtrFldAmount->set_digits(0); - SetMetricValue( *m_xMtrFldAmount, nValue, eUnit ); - } + m_xMtrFldAmount->set_increments(1, 10, FieldUnit::NONE); + m_xMtrFldAmount->set_range(1, 100, FieldUnit::NONE); + m_xMtrFldAmount->set_value(nValue, FieldUnit::NONE); } else { - m_xMtrFldAmount->set_sensitive(false); - m_xMtrFldAmount->set_text(""); - m_xTsbPixel->set_state( TRISTATE_INDET ); + m_xTsbPixel->set_state(TRISTATE_FALSE); + m_xMtrFldAmount->set_unit(eFUnit); + m_xMtrFldAmount->set_digits(2); + + m_xMtrFldAmount->set_increments(10, 100, FieldUnit::NONE); + m_xMtrFldAmount->set_range(1, 10000, FieldUnit::NONE); + + SetMetricValue(*m_xMtrFldAmount, nValue, eUnit); } m_xTsbPixel->save_state(); m_xMtrFldAmount->save_value(); diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index b80cfd38fd7c..0a6d3696ebc0 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -116,52 +116,31 @@ void SvxTextAttrPage::Reset( const SfxItemSet* rAttrs ) MapUnit eUnit = pPool->GetMetric( SDRATTR_TEXT_LEFTDIST ); const SfxPoolItem* pItem = GetItem( *rAttrs, SDRATTR_TEXT_LEFTDIST ); - if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_LEFTDIST ); - if( pItem ) - { - long nValue = static_cast<const SdrMetricItem*>( pItem )->GetValue(); - SetMetricValue( *m_xMtrFldLeft, nValue, eUnit ); - } - else - m_xMtrFldLeft->set_text(""); + + SetMetricValue(*m_xMtrFldLeft, static_cast<const SdrMetricItem*>(pItem)->GetValue(), eUnit); m_xMtrFldLeft->save_value(); pItem = GetItem( *rAttrs, SDRATTR_TEXT_RIGHTDIST ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_RIGHTDIST ); - if( pItem ) - { - long nValue = static_cast<const SdrMetricItem*>( pItem )->GetValue(); - SetMetricValue( *m_xMtrFldRight, nValue, eUnit ); - } - else - m_xMtrFldRight->set_text(""); + + SetMetricValue(*m_xMtrFldRight, static_cast<const SdrMetricItem*>(pItem)->GetValue(), eUnit); m_xMtrFldRight->save_value(); pItem = GetItem( *rAttrs, SDRATTR_TEXT_UPPERDIST ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_UPPERDIST ); - if( pItem ) - { - long nValue = static_cast<const SdrMetricItem*>( pItem )->GetValue(); - SetMetricValue( *m_xMtrFldTop, nValue, eUnit ); - } - else - m_xMtrFldTop->set_text(""); + + SetMetricValue(*m_xMtrFldTop, static_cast<const SdrMetricItem*>(pItem)->GetValue(), eUnit); m_xMtrFldTop->save_value(); pItem = GetItem( *rAttrs, SDRATTR_TEXT_LOWERDIST ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_LOWERDIST ); - if( pItem ) - { - long nValue = static_cast<const SdrMetricItem*>(pItem)->GetValue(); - SetMetricValue( *m_xMtrFldBottom, nValue, eUnit ); - } - else - m_xMtrFldBottom->set_text(""); + + SetMetricValue(*m_xMtrFldBottom, static_cast<const SdrMetricItem*>(pItem)->GetValue(), eUnit); m_xMtrFldBottom->save_value(); // adjust to height and autogrowsize |