[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sw/source

[Maxim Monastirsky]

 sw/source/uibase/docvw/edtwin.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1fc5b27a72f00b34a681cd9aa63438119436e7dd
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Sat Dec 23 22:13:55 2017 +0200

    tdf#114670 Make sure to dispose the menu
    
    Conflicts:
            sw/source/uibase/docvw/edtwin.cxx
    
    Change-Id: I30612a0b3cfef7d19ff6a5180db76a8002186bd5
    Reviewed-on: https://gerrit.libreoffice.org/47025
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>
    (cherry picked from commit baccbd4508a375090f4d95a2dab02c8b5d404ee2)
    Reviewed-on: https://gerrit.libreoffice.org/47032
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index e9097d19fc72..0bd2b7d49347 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -5280,7 +5280,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
                         aEvent.SourceWindow = VCLUnoHelper::GetInterface( this );
                         aEvent.ExecutePosition.X = aPixPos.X();
                         aEvent.ExecutePosition.Y = aPixPos.Y();
-                        VclPtr<Menu> pMenu;
+                        ScopedVclPtr<Menu> pMenu;
                         OUString sMenuName("private:resource/ReadonlyContextMenu");
                         if (GetView().TryContextMenuInterception(aROPopup.GetMenu(), sMenuName, pMenu, aEvent))
                         {