diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-01-13 15:29:41 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-06-29 05:46:28 +0200 |
| commit | 433ef82cae097383b5641e987aebf4c5c8d25b4a (patch) | |
| tree | 9d3669a95857c64714420abde3e75b8ade5611ca /editeng | |
| parent | a135076e65deb79b8cfc73011d3aebd42b4d4166 (diff) | |
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 <caolanm@redhat.com>
(cherry picked from commit efb6e29359a14888fa9ba1c77c5f34a1e37333cd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118041
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/editeng/impedit.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
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); } |