editeng/source/editeng/impedit.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
New commits: commit efb6e29359a14888fa9ba1c77c5f34a1e37333cd Author: Caolán McNamara <[email protected]> AuthorDate: Wed Jan 13 15:29:41 2021 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Wed Jan 13 20:38:46 2021 +0100 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]> diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index bd2f0bf24218..4f0f4ccac865 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -826,7 +826,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
