only use css::awt::XPopupMenu methods
Change-Id: Ibd3c54b91e757dbca17a4b95462cbd0b7fa16f36 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126699 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
@@ -38,7 +38,6 @@
|
|||||||
#include <svx/dbaobjectex.hxx>
|
#include <svx/dbaobjectex.hxx>
|
||||||
#include <vcl/commandevent.hxx>
|
#include <vcl/commandevent.hxx>
|
||||||
#include <vcl/event.hxx>
|
#include <vcl/event.hxx>
|
||||||
#include <vcl/menu.hxx>
|
|
||||||
#include <vcl/svapp.hxx>
|
#include <vcl/svapp.hxx>
|
||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
@@ -387,7 +386,6 @@ IMPL_LINK(TreeListBox, CommandHdl, const CommandEvent&, rCEvt, bool)
|
|||||||
|
|
||||||
rtl::Reference xPopupMenu( new VCLXPopupMenu );
|
rtl::Reference xPopupMenu( new VCLXPopupMenu );
|
||||||
xMenuController->setPopupMenu( xPopupMenu );
|
xMenuController->setPopupMenu( xPopupMenu );
|
||||||
VclPtr<PopupMenu> pContextMenu( static_cast< PopupMenu* >( xPopupMenu->GetMenu() ) );
|
|
||||||
|
|
||||||
// allow context menu interception
|
// allow context menu interception
|
||||||
::comphelper::OInterfaceContainerHelper2* pInterceptors = m_pContextMenuProvider->getContextMenuInterceptors();
|
::comphelper::OInterfaceContainerHelper2* pInterceptors = m_pContextMenuProvider->getContextMenuInterceptors();
|
||||||
@@ -459,7 +457,6 @@ IMPL_LINK(TreeListBox, CommandHdl, const CommandEvent&, rCEvt, bool)
|
|||||||
// do action for selected entry in popup menu
|
// do action for selected entry in popup menu
|
||||||
css::uno::Reference<css::awt::XWindowPeer> xParent(xSourceWindow, css::uno::UNO_QUERY);
|
css::uno::Reference<css::awt::XWindowPeer> xParent(xSourceWindow, css::uno::UNO_QUERY);
|
||||||
xPopupMenu->execute(xParent, css::awt::Rectangle(aPos.X(), aPos.Y(), 1, 1), css::awt::PopupMenuDirection::EXECUTE_DOWN);
|
xPopupMenu->execute(xParent, css::awt::Rectangle(aPos.X(), aPos.Y(), 1, 1), css::awt::PopupMenuDirection::EXECUTE_DOWN);
|
||||||
pContextMenu.disposeAndClear();
|
|
||||||
|
|
||||||
css::uno::Reference<css::lang::XComponent> xComponent(xMenuController, css::uno::UNO_QUERY);
|
css::uno::Reference<css::lang::XComponent> xComponent(xMenuController, css::uno::UNO_QUERY);
|
||||||
if (xComponent.is())
|
if (xComponent.is())
|
||||||
|
Reference in New Issue
Block a user