vcl/source/window/toolbox.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
New commits: commit 10496770a6c4ba870787f20a4f0948c30e3d59cd Author: Jim Raykowski <[email protected]> Date: Fri Feb 9 16:50:22 2018 -0900 tdf#115602 keyboard navigation: Skip disabled toolbox items Change-Id: I793dd301a04435c79a97819497b9d34fa49e298b Reviewed-on: https://gerrit.libreoffice.org/49697 Tested-by: Jenkins <[email protected]> Reviewed-by: Thorsten Behrens <[email protected]> diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index e8031248714f..3bfbe0eff6b3 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -4882,7 +4882,8 @@ void ToolBox::ImplChangeHighlight( ImplToolItem const * pItem, bool bNoGrabFocus // check for keyboard accessible items static bool ImplIsValidItem( const ImplToolItem* pItem, bool bNotClipped ) { - bool bValid = (pItem && pItem->meType == ToolBoxItemType::BUTTON && pItem->mbVisible && !ImplIsFixedControl( pItem )); + bool bValid = (pItem && pItem->meType == ToolBoxItemType::BUTTON && pItem->mbVisible && !ImplIsFixedControl( pItem ) + && pItem->mbEnabled); if( bValid && bNotClipped && pItem->IsClipped() ) bValid = false; return bValid; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
