diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-04-14 15:44:44 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-14 15:44:44 +0100 |
| commit | 6b55bfe5659a2160e69a8dc255caabf3cc10c437 (patch) | |
| tree | 27f8536facec29587c04fabedce02010affc7fbe | |
| parent | aca25d6123da5e6da9b3f25ac0347a479b1d5526 (diff) | |
the context menu has only DELETE in it
Change-Id: Ib581011e4f3adda8b6f81d1c2cbdf5de5da80f55
| -rw-r--r-- | reportdesign/source/ui/dlg/GroupsSorting.cxx | 24 | ||||
| -rw-r--r-- | reportdesign/source/ui/dlg/GroupsSorting.src | 3 |
2 files changed, 6 insertions, 21 deletions
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index eba7ab9d24e6..a471e7e15634 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -721,26 +721,12 @@ void OFieldExpressionControl::Command(const CommandEvent& rEvt) bEnable = true; nIndex = NextSelectedRow(); } - aContextMenu->EnableItem( SID_DELETE, IsDeleteAllowed() && bEnable ); - switch (aContextMenu->Execute(this, rEvt.GetMousePosPixel())) + aContextMenu->EnableItem(SID_DELETE, IsDeleteAllowed() && bEnable); + if (aContextMenu->Execute(this, rEvt.GetMousePosPixel()) == SID_DELETE) { - case SID_CUT: - cut(); - break; - case SID_COPY: - copy(); - break; - case SID_PASTE: - paste(); - break; - - case SID_DELETE: - if( m_nDeleteEvent ) - Application::RemoveUserEvent( m_nDeleteEvent ); - m_nDeleteEvent = Application::PostUserEvent( LINK(this, OFieldExpressionControl, DelayedDelete), nullptr, true ); - break; - default: - break; + if( m_nDeleteEvent ) + Application::RemoveUserEvent( m_nDeleteEvent ); + m_nDeleteEvent = Application::PostUserEvent( LINK(this, OFieldExpressionControl, DelayedDelete), nullptr, true ); } } SAL_FALLTHROUGH; diff --git a/reportdesign/source/ui/dlg/GroupsSorting.src b/reportdesign/source/ui/dlg/GroupsSorting.src index 687f6ba0bdb3..21148dbd571e 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.src +++ b/reportdesign/source/ui/dlg/GroupsSorting.src @@ -112,8 +112,7 @@ Menu RID_GROUPSROWPOPUPMENU MenuItem { Identifier = SID_DELETE ; - Command = ".uno:Delete" ; - Text [ en-US ] = "~Delete" ; + Text [ en-US ] = "~Delete FOO" ; }; }; }; |