diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2016-11-11 01:27:49 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-11-11 15:27:14 +0000 |
| commit | 2bb209eeb9db2243d4a0e9d460adb210c8bfd0c8 (patch) | |
| tree | 54802388c8e8748712c9032e704461c10a3493b0 /framework | |
| parent | 92e983f3eb22737eca04fc32ec61e1d9159cc10c (diff) | |
tdf#103826 Missing master page pane context menus in Draw
(cherry picked from commit 749fe62b32acc3159cf2756aae16df36f091a862)
changes from master: Removed officecfg part to avoid breaking
string freeze, added nullptr check to be on the safe side.
Change-Id: I355e9507692e770063a91d05efd3ebc3e2671d57
Reviewed-on: https://gerrit.libreoffice.org/30766
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/resourcemenucontroller.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/framework/source/uielement/resourcemenucontroller.cxx b/framework/source/uielement/resourcemenucontroller.cxx index 57674a1f2115..2358f1b0e450 100644 --- a/framework/source/uielement/resourcemenucontroller.cxx +++ b/framework/source/uielement/resourcemenucontroller.cxx @@ -181,6 +181,9 @@ void ResourceMenuController::updatePopupMenu() } } + if ( !m_xMenuContainer.is() ) + return; + // Clear previous content. if ( m_xMenuBarManager.is() ) { @@ -246,9 +249,6 @@ void ResourceMenuController::addVerbs( const css::uno::Sequence< css::embed::Ver void ResourceMenuController::fillToolbarData() { - if ( !m_xMenuContainer.is() ) - return; - VCLXMenu* pAwtMenu = VCLXMenu::GetImplementation( m_xPopupMenu ); Menu* pVCLMenu = pAwtMenu->GetMenu(); |