diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2016-06-09 14:29:45 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2016-06-09 12:53:43 +0000 |
| commit | bdd67652b6b60164220c259b5c4dbef1aba85102 (patch) | |
| tree | 2675c938dfc5ffdf5a48d0f7cd88dc2f1c576b1d /framework | |
| parent | 2c08ec226e771de10c8863b7f1cda016fea442d2 (diff) | |
Try to get rid of svt::ContextMenuHelper
Change-Id: I7b43e417607b20c300e3c18e7da76a6173a18b7d
Reviewed-on: https://gerrit.libreoffice.org/26098
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/resourcemenucontroller.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/framework/source/uielement/resourcemenucontroller.cxx b/framework/source/uielement/resourcemenucontroller.cxx index 57674a1f2115..47c3f1ccd0f8 100644 --- a/framework/source/uielement/resourcemenucontroller.cxx +++ b/framework/source/uielement/resourcemenucontroller.cxx @@ -112,8 +112,7 @@ ResourceMenuController::~ResourceMenuController() void ResourceMenuController::updatePopupMenu() throw ( css::uno::RuntimeException, std::exception ) { - if ( m_xMenuContainer.is() && !m_bContextMenu ) - // Container is still valid, no need to do anything on our side. + if ( ( m_xMenuContainer.is() && !m_bContextMenu ) || m_aMenuURL.isEmpty() ) return; if ( m_aModuleName.isEmpty() ) |