diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-04-14 16:40:08 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-14 16:40:08 +0100 |
commit | 88b42085ab5af0f865573180e642af9b29f472e5 (patch) | |
tree | d7f21cce1aa299d63d83805d8086bfbbadf250eb /svx/source | |
parent | 7a01268f3fccd9cb43097f27696fec563f21b336 (diff) |
convert cell menu to .ui
Change-Id: If0b17eb94a629d6a46d5fd44430e866135a4c002
Diffstat (limited to 'svx/source')
-rw-r--r-- | svx/source/fmcomp/gridctrl.cxx | 12 | ||||
-rw-r--r-- | svx/source/fmcomp/gridctrl.src | 13 |
2 files changed, 4 insertions, 21 deletions
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index c4ee149afe30..363df1260eda 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -2860,14 +2860,10 @@ void DbGridControl::Command(const CommandEvent& rEvt) } else if (canCopyCellText(nRow, nColId)) { - ScopedVclPtrInstance<PopupMenu> aContextMenu(SVX_RES(RID_SVXMNU_CELL)); - aContextMenu->RemoveDisabledEntries(true, true); - switch (aContextMenu->Execute(this, rEvt.GetMousePosPixel())) - { - case SID_COPY: - copyCellText(nRow, nColId); - break; - } + VclBuilder aBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "svx/ui/cellmenu.ui", ""); + VclPtr<PopupMenu> aContextMenu(aBuilder.get_menu("menu")); + if (aContextMenu->Execute(this, rEvt.GetMousePosPixel())) + copyCellText(nRow, nColId); } else { diff --git a/svx/source/fmcomp/gridctrl.src b/svx/source/fmcomp/gridctrl.src index b5365864420e..443537dea90e 100644 --- a/svx/source/fmcomp/gridctrl.src +++ b/svx/source/fmcomp/gridctrl.src @@ -161,17 +161,4 @@ Menu RID_SVXMNU_COLS }; }; -Menu RID_SVXMNU_CELL -{ - ItemList = - { - MenuItem - { - Identifier = SID_COPY ; - Command = ".uno:Copy" ; - Text [ en-US ] = "~Copy" ; - }; - }; -}; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |