diff options
Diffstat (limited to 'sc/source/ui/view/gridwin.cxx')
| -rw-r--r-- | sc/source/ui/view/gridwin.cxx | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 311a59d8dbcd..9282acef724d 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -3132,23 +3132,23 @@ void ScGridWindow::Command( const CommandEvent& rCEvt ) } } - if (!bDone) - { - // tdf#140361 at this context menu popup time get what the - // DisableEditHyperlink would be for this position - bool bShouldDisableEditHyperlink = mrViewData.GetViewShell()->ShouldDisableEditHyperlink(); + if (bDone) + return; - SfxDispatcher::ExecutePopup( this, &aMenuPos ); + // tdf#140361 at this context menu popup time get what the + // DisableEditHyperlink would be for this position + bool bShouldDisableEditHyperlink = mrViewData.GetViewShell()->ShouldDisableEditHyperlink(); - if (!bShouldDisableEditHyperlink) - { - SfxBindings& rBindings = mrViewData.GetBindings(); - // tdf#140361 set what the menu popup state for this was - mrViewData.GetViewShell()->EnableEditHyperlink(); - // ensure moAtContextMenu_DisableEditHyperlink will be cleared - // in the case that EditHyperlink is not dispatched by the menu - rBindings.Invalidate(SID_EDIT_HYPERLINK); - } + SfxDispatcher::ExecutePopup( this, &aMenuPos ); + + if (!bShouldDisableEditHyperlink) + { + SfxBindings& rBindings = mrViewData.GetBindings(); + // tdf#140361 set what the menu popup state for this was + mrViewData.GetViewShell()->EnableEditHyperlink(); + // ensure moAtContextMenu_DisableEditHyperlink will be cleared + // in the case that EditHyperlink is not dispatched by the menu + rBindings.Invalidate(SID_EDIT_HYPERLINK); } } |