diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-03-26 16:27:17 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-03-28 22:07:06 +0100 |
| commit | 3e078e17ee2144fb976a7e6b9227152113cea0d4 (patch) | |
| tree | 01faab7d3c82c5b027b42a6722700736b249a775 /svx | |
| parent | 1e2868296730d3548574f61a3c6e323aa5c0598a (diff) | |
weld SfxTemplateManagerDlg
like expert configuration change the gear menu not to display a down indicator
and use CommandEvent to distinguish mouse/non-mouse context menus
Change-Id: I64bb660a9c7dacb5b90b240d9d76d29324c5fd9f
Reviewed-on: https://gerrit.libreoffice.org/69893
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/charmap.cxx | 4 | ||||
| -rw-r--r-- | svx/source/tbxctrls/SvxPresetListBox.cxx | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 50e1f5b12544..3834862f275e 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -239,9 +239,9 @@ void SvxShowCharSet::createContextMenu() sal_UCS4 cChar = GetSelectCharacter(); OUString aOUStr( &cChar, 1 ); if (isFavChar(aOUStr, mxVirDev->GetFont().GetFamilyName()) || maFavCharList.size() >= 16) - xItemMenu->show("add", false); + xItemMenu->set_visible("add", false); else - xItemMenu->show("remove", false); + xItemMenu->set_visible("remove", false); ContextMenuSelect(xItemMenu->popup_at_rect(GetDrawingArea(), tools::Rectangle(maPosition, Size(1,1)))); GrabFocus(); diff --git a/svx/source/tbxctrls/SvxPresetListBox.cxx b/svx/source/tbxctrls/SvxPresetListBox.cxx index fc3e18e8868d..2018b8a6fce4 100644 --- a/svx/source/tbxctrls/SvxPresetListBox.cxx +++ b/svx/source/tbxctrls/SvxPresetListBox.cxx @@ -20,6 +20,7 @@ #include <svx/SvxPresetListBox.hxx> #include <svx/xtable.hxx> #include <vcl/builderfactory.hxx> +#include <vcl/commandevent.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <vcl/image.hxx> @@ -43,14 +44,14 @@ void SvxPresetListBox::Resize() SvtValueSet::Resize(); } -bool SvxPresetListBox::ContextMenu(const Point& rPos) +bool SvxPresetListBox::ContextMenu(const CommandEvent& rEvent) { const sal_uInt16 nIndex = GetSelectedItemId(); if(nIndex > 0) { std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetDrawingArea(), "svx/ui/presetmenu.ui")); std::unique_ptr<weld::Menu> xMenu(xBuilder->weld_menu("menu")); - OnMenuItemSelected(xMenu->popup_at_rect(GetDrawingArea(), tools::Rectangle(rPos, Size(1,1)))); + OnMenuItemSelected(xMenu->popup_at_rect(GetDrawingArea(), tools::Rectangle(rEvent.GetMousePosPixel(), Size(1,1)))); return true; } return false; |