vcl/source/window/taskpanelist.cxx | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 0ab044a4798d9968c303e5616f4a307cab0fd62d
Author: Jim Raykowski <rayk...@gmail..com>
AuthorDate: Sun Nov 24 20:01:43 2019 -0900
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Wed Dec 11 10:37:08 2019 +0100
tdf#105518 F6: Skip infobar when it has no children
Change-Id: Id5375d9acfd20844a56da20fcf08c709423f75e0
Reviewed-on: https://gerrit.libreoffice.org/83636
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
diff --git a/vcl/source/window/taskpanelist.cxx
b/vcl/source/window/taskpanelist.cxx
index c7af916d16b0..307bb4d29a39 100644
--- a/vcl/source/window/taskpanelist.cxx
+++ b/vcl/source/window/taskpanelist.cxx
@@ -275,7 +275,12 @@ vcl::Window* TaskPaneList::FindNextFloat( vcl::Window
*pWindow, bool bForward )
break; // do not wrap, send focus back to document at end of list
/* #i83908# do not use the menubar if it is native and invisible
*/
- if( (*p)->IsReallyVisible() && !(*p)->ImplIsSplitter() &&
+
+ bool bSkip = false; // used to skip infobar when it has no children
+ if( (*p)->GetType() == WindowType::WINDOW && (*p)->GetChildCount() ==
0 )
+ bSkip = true;
+
+ if( !bSkip && (*p)->IsReallyVisible() && !(*p)->ImplIsSplitter() &&
( (*p)->GetType() != WindowType::MENUBARWINDOW ||
static_cast<MenuBarWindow*>(p->get())->CanGetFocus() ) )
{
pWindow = (*p).get();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
