editeng/source/editeng/impedit.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
New commits: commit 433ef82cae097383b5641e987aebf4c5c8d25b4a Author: Caolán McNamara <[email protected]> AuthorDate: Wed Jan 13 15:29:41 2021 +0000 Commit: Andras Timar <[email protected]> CommitDate: Tue Jun 29 05:46:28 2021 +0200 tdf#139493 EditViewCallbacks might not implement EditViewPopupParent in which case fallback to the vcl::Window Change-Id: Idc72f04ce72b1bcd42d80869e0ee86b653343a17 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109234 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> (cherry picked from commit efb6e29359a14888fa9ba1c77c5f34a1e37333cd) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118041 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Andras Timar <[email protected]> diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index babade9ae2a5..00e278316d89 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -838,7 +838,11 @@ OutputDevice& ImpEditView::GetOutputDevice() const weld::Widget* ImpEditView::GetPopupParent(tools::Rectangle& rRect) const { if (EditViewCallbacks* pCallbacks = getEditViewCallbacks()) - return pCallbacks->EditViewPopupParent(); + { + weld::Widget* pParent = pCallbacks->EditViewPopupParent(); + if (pParent) + return pParent; + } return weld::GetPopupParent(*pOutWin, rRect); } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
