From 2d582244680e7f6dec6e4a466e276f93ccb01dc9 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 10 Aug 2020 20:47:32 +0200 Subject: loplugin:flatten Change-Id: I6560756eb63856a22b43e3e65a7b7843cd2d5376 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100447 Tested-by: Jenkins Reviewed-by: Noel Grandin --- svtools/source/brwbox/editbrowsebox2.cxx | 28 +++++----- svtools/source/control/valueset.cxx | 70 ++++++++++++------------- svtools/source/uno/generictoolboxcontroller.cxx | 34 ++++++------ 3 files changed, 66 insertions(+), 66 deletions(-) (limited to 'svtools') diff --git a/svtools/source/brwbox/editbrowsebox2.cxx b/svtools/source/brwbox/editbrowsebox2.cxx index 7c84cf5eb805..a3505877be18 100644 --- a/svtools/source/brwbox/editbrowsebox2.cxx +++ b/svtools/source/brwbox/editbrowsebox2.cxx @@ -146,25 +146,25 @@ void EditBrowseBox::DetermineFocus( const GetFocusFlags _nGetFocusFlags ) long nRows = GetRowCount(); sal_uInt16 nCols = ColCount(); - if ( ( nRows > 0 ) && ( nCols > 0 ) ) + if (( nRows <= 0 ) || ( nCols <= 0 )) + return; + + if ( _nGetFocusFlags & GetFocusFlags::Forward ) { - if ( _nGetFocusFlags & GetFocusFlags::Forward ) + if ( GetColumnId( 0 ) != HandleColumnId ) { - if ( GetColumnId( 0 ) != HandleColumnId ) - { - GoToRowColumnId( 0, GetColumnId( 0 ) ); - } - else - { // the first column is the handle column -> not focussable - if ( nCols > 1 ) - GoToRowColumnId( 0, GetColumnId( 1 ) ); - } + GoToRowColumnId( 0, GetColumnId( 0 ) ); } - else if ( _nGetFocusFlags & GetFocusFlags::Backward ) - { - GoToRowColumnId( nRows - 1, GetColumnId( nCols -1 ) ); + else + { // the first column is the handle column -> not focussable + if ( nCols > 1 ) + GoToRowColumnId( 0, GetColumnId( 1 ) ); } } + else if ( _nGetFocusFlags & GetFocusFlags::Backward ) + { + GoToRowColumnId( nRows - 1, GetColumnId( nCols -1 ) ); + } } tools::Rectangle EditBrowseBox::GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 _nIndex) diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index 86621636ea64..74a09e613d26 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -760,54 +760,54 @@ void ValueSet::SelectItem( sal_uInt16 nItemId ) Invalidate(); } - if( ImplHasAccessibleListeners() ) + if( !ImplHasAccessibleListeners() ) + return; + + // focus event (deselect) + if( nOldItem ) { - // focus event (deselect) - if( nOldItem ) + const size_t nPos = GetItemPos( nItemId ); + + if( nPos != VALUESET_ITEM_NOTFOUND ) { - const size_t nPos = GetItemPos( nItemId ); + ValueItemAcc* pItemAcc = ValueItemAcc::getImplementation( + mItemList[nPos]->GetAccessible( false/*bIsTransientChildrenDisabled*/ ) ); - if( nPos != VALUESET_ITEM_NOTFOUND ) + if( pItemAcc ) { - ValueItemAcc* pItemAcc = ValueItemAcc::getImplementation( - mItemList[nPos]->GetAccessible( false/*bIsTransientChildrenDisabled*/ ) ); - - if( pItemAcc ) - { - Any aOldAny; - Any aNewAny; - aOldAny <<= Reference(static_cast(pItemAcc)); - ImplFireAccessibleEvent(AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, aOldAny, aNewAny ); - } + Any aOldAny; + Any aNewAny; + aOldAny <<= Reference(static_cast(pItemAcc)); + ImplFireAccessibleEvent(AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, aOldAny, aNewAny ); } } + } - // focus event (select) - const size_t nPos = GetItemPos( mnSelItemId ); + // focus event (select) + const size_t nPos = GetItemPos( mnSelItemId ); - ValueSetItem* pItem; - if( nPos != VALUESET_ITEM_NOTFOUND ) - pItem = mItemList[nPos].get(); - else - pItem = mpNoneItem.get(); + ValueSetItem* pItem; + if( nPos != VALUESET_ITEM_NOTFOUND ) + pItem = mItemList[nPos].get(); + else + pItem = mpNoneItem.get(); - ValueItemAcc* pItemAcc = nullptr; - if (pItem != nullptr) - pItemAcc = ValueItemAcc::getImplementation( pItem->GetAccessible( false/*bIsTransientChildrenDisabled*/ ) ); + ValueItemAcc* pItemAcc = nullptr; + if (pItem != nullptr) + pItemAcc = ValueItemAcc::getImplementation( pItem->GetAccessible( false/*bIsTransientChildrenDisabled*/ ) ); - if( pItemAcc ) - { - Any aOldAny; - Any aNewAny; - aNewAny <<= Reference(static_cast(pItemAcc)); - ImplFireAccessibleEvent(AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, aOldAny, aNewAny); - } - - // selection event + if( pItemAcc ) + { Any aOldAny; Any aNewAny; - ImplFireAccessibleEvent(AccessibleEventId::SELECTION_CHANGED, aOldAny, aNewAny); + aNewAny <<= Reference(static_cast(pItemAcc)); + ImplFireAccessibleEvent(AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, aOldAny, aNewAny); } + + // selection event + Any aOldAny; + Any aNewAny; + ImplFireAccessibleEvent(AccessibleEventId::SELECTION_CHANGED, aOldAny, aNewAny); } void ValueSet::SetNoSelection() diff --git a/svtools/source/uno/generictoolboxcontroller.cxx b/svtools/source/uno/generictoolboxcontroller.cxx index 570805632b53..57f7f5553b44 100644 --- a/svtools/source/uno/generictoolboxcontroller.cxx +++ b/svtools/source/uno/generictoolboxcontroller.cxx @@ -180,27 +180,27 @@ void GenericToolboxController::statusChanged( const FeatureStateEvent& Event ) m_xToolbox->SetItemBits( m_nID, nItemBits ); } - if (m_pToolbox) - { - OString sId = m_aCommandURL.toUtf8(); + if (!m_pToolbox) + return; - m_pToolbox->set_item_sensitive(sId, Event.IsEnabled); + OString sId = m_aCommandURL.toUtf8(); - bool bValue; - OUString aStrValue; + m_pToolbox->set_item_sensitive(sId, Event.IsEnabled); - if ( Event.State >>= bValue ) - { - // Boolean, treat it as checked/unchecked - m_pToolbox->set_item_active(sId, bValue); - } - else if ( Event.State >>= aStrValue ) - { - m_pToolbox->set_item_label(sId, aStrValue); - } - else - m_pToolbox->set_item_active(sId, false); + bool bValue; + OUString aStrValue; + + if ( Event.State >>= bValue ) + { + // Boolean, treat it as checked/unchecked + m_pToolbox->set_item_active(sId, bValue); + } + else if ( Event.State >>= aStrValue ) + { + m_pToolbox->set_item_label(sId, aStrValue); } + else + m_pToolbox->set_item_active(sId, false); } IMPL_STATIC_LINK( GenericToolboxController, ExecuteHdl_Impl, void*, p, void ) -- cgit