summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-01-13 15:29:41 +0000
committerCaolán McNamara <caolanm@redhat.com>2021-01-13 20:38:46 +0100
commitefb6e29359a14888fa9ba1c77c5f34a1e37333cd (patch)
tree3b31413b9c4286a9fcf38a7bb95ee9960cd46dc9 /editeng
parent8453bc55a4d6c58033559097bfd7c52379725a2f (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>
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/editeng/impedit.cxx6
1 files changed, 5 insertions, 1 deletions
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);
}