diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-01-08 10:50:08 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-01-08 18:15:01 +0100 |
| commit | e653a084ef8693aaf8396e8d6c7fb605f5b59f94 (patch) | |
| tree | 0a4d81bb9be7def61451302b3201fc369a14643f /svtools/source/uno | |
| parent | c1599fc5c9800086548595d1f1464619a7024d06 (diff) | |
add a scheme to host welded toolbar dropdown windows in unwelded toolbars
Change-Id: I72c9896798740a760eac479bdccaf7825872c01b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86420
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svtools/source/uno')
| -rw-r--r-- | svtools/source/uno/popupwindowcontroller.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx index cc283adbdf42..7b1e3357424d 100644 --- a/svtools/source/uno/popupwindowcontroller.cxx +++ b/svtools/source/uno/popupwindowcontroller.cxx @@ -176,6 +176,7 @@ sal_Bool SAL_CALL PopupWindowController::supportsService( const OUString& Servic // XComponent void SAL_CALL PopupWindowController::dispose() { + mxInterimPopover.clear(); mxPopover.reset(); mxImpl.reset(); svt::ToolboxController::dispose(); @@ -238,7 +239,10 @@ Reference< awt::XWindow > SAL_CALL PopupWindowController::createPopupWindow() void PopupWindowController::EndPopupMode() { - m_pToolbar->set_menu_item_active(m_aCommandURL.toUtf8(), false); + if (m_pToolbar) + m_pToolbar->set_menu_item_active(m_aCommandURL.toUtf8(), false); + else if (mxInterimPopover) + mxInterimPopover->EndPopupMode(); } } |