diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2015-12-17 00:55:49 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-12 22:06:31 -0400 |
| commit | 8142805b95c69945b42b4e79c0919e6741da7628 (patch) | |
| tree | ee17db5cc1e86c145595fd7c15fe7991a388c3ce /sfx2 | |
| parent | 8f0f2807a3305e3ddd85b222525ebb396900d31d (diff) | |
nConfigId is always 0
Change-Id: Ic314bc04a22ebf23fa7b06dca06e4d2afae096f9
(cherry picked from commit 0ac22118721b426b2fc441a1c37572cda972be08)
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/control/dispatch.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index e50f9abc3e05..2dc5ac8c8394 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -1873,17 +1873,14 @@ SfxPopupMenuManager* SfxDispatcher::Popup( sal_uInt16 nConfigId, vcl::Window *pW return nullptr; } -void SfxDispatcher::ExecutePopup( sal_uInt16 nConfigId, vcl::Window *pWin, const Point *pPos ) +void SfxDispatcher::ExecutePopup( vcl::Window *pWin, const Point *pPos ) { SfxDispatcher &rDisp = *SfxGetpApp()->GetDispatcher_Impl(); sal_uInt16 nShLevel = 0; SfxShell *pSh; if ( rDisp.xImp->bQuiet ) - { - nConfigId = 0; nShLevel = rDisp.xImp->aStack.size(); - } vcl::Window *pWindow = pWin ? pWin : rDisp.xImp->pFrame->GetFrame().GetWorkWindow_Impl()->GetWindow(); Point aPos = pPos ? *pPos : pWindow->GetPointerPosPixel(); @@ -1891,12 +1888,12 @@ void SfxDispatcher::ExecutePopup( sal_uInt16 nConfigId, vcl::Window *pWin, const { const ResId& rResId = pSh->GetInterface()->GetPopupMenuResId(); const OUString& rResName = pSh->GetInterface()->GetPopupMenuName(); - if ( ( nConfigId == 0 && rResId.GetId() ) || ( nConfigId != 0 && rResId.GetId() == nConfigId ) ) + if ( rResId.GetId() ) { SfxPopupMenuManager::ExecutePopup( rResId, rDisp.GetFrame(), aPos, pWindow ); return; } - else if ( nConfigId == 0 && !rResName.isEmpty() ) + else if ( !rResName.isEmpty() ) { css::uno::Sequence< css::uno::Any > aArgs( 3 ); aArgs[0] <<= comphelper::makePropertyValue( "Value", rResName ); |