vcl/source/window/dialog.cxx | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit cde86a07bdd3534f75ec94955837812e2bbd24d4
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue May 14 16:01:58 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu May 16 13:39:15 2019 +0200
Resolves: tdf#125266 hang on selecting read online help
Change-Id: I46d14df66c529495a7e9f1596fcdbb0b093810c5
Reviewed-on: https://gerrit.libreoffice.org/72298
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/72400
Tested-by: Xisco Faulí <xiscofa...@libreoffice.org>
Reviewed-by: Michael Stahl <michael.st...@cib.de>
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 9378f71cf0a5..e88d5aacaea2 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1556,8 +1556,12 @@ void TopLevelWindowLocker::incBusy(const vcl::Window*
pIgnore)
vcl::Window *pTopWin = Application::GetFirstTopLevelWindow();
while (pTopWin)
{
- if (pTopWin != pIgnore)
- aTopLevels.push_back(pTopWin);
+ vcl::Window* pCandidate = pTopWin;
+ if (pCandidate->GetType() == WindowType::BORDERWINDOW)
+ pCandidate = pCandidate->GetWindow(GetWindowType::FirstChild);
+ // tdf#125266 ignore HelpTextWindows
+ if (pCandidate && pCandidate->GetType() != WindowType::HELPTEXTWINDOW
&& pCandidate != pIgnore)
+ aTopLevels.push_back(pCandidate);
pTopWin = Application::GetNextTopLevelWindow(pTopWin);
}
for (auto& a : aTopLevels)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
