[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sfx2/source

[Julien Nabet (via logerrit)]

 sfx2/source/control/dispatch.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f4bc77275485e3213c5592062d29905e624953ee
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sun Jun 12 18:07:22 2022 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Jun 13 13:11:38 2022 +0200

    Fix context menu on image which doesnt display
    
    - Launch Writer
    - Insert any image in it
    - Right click on it
    => Nothing displays
    + console shows:
    warn:legacy.osl:67182:67182:vcl/source/window/menu.cxx:2750: 
PopupMenu::Execute: need a non-NULL window!
    
    Regression from f71606c920a3f78294da745cd9ef1eacde010224
    new loplugin:moveit
    
    Change-Id: I89f5bfe2a3cd6a935b419d55c2f3e884c7eed2c7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135681
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
    (cherry picked from commit 8ec56c5ab7ff81d271820ddfa66f27fbc950dbe6)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135696
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index f6082ad8f9a4..17edf97cc16d 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -1850,7 +1850,7 @@ void SfxDispatcher::ExecutePopup( const OUString& 
rResName, vcl::Window* pWin, c
     else
     {
         OUString aMenuURL = "private:resource/popupmenu/" + rResName;
-        if (GetFrame()->GetViewShell()->TryContextMenuInterception(xPopupMenu, 
aMenuURL, std::move(aEvent)))
+        if (GetFrame()->GetViewShell()->TryContextMenuInterception(xPopupMenu, 
aMenuURL, aEvent))
         {
             css::uno::Reference<css::awt::XWindowPeer> 
xParent(aEvent.SourceWindow, css::uno::UNO_QUERY);
             xPopupMenu->execute(xParent, css::awt::Rectangle(aPos.X(), 
aPos.Y(), 1, 1), css::awt::PopupMenuDirection::EXECUTE_DOWN);