[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sw/source

[Libreoffice Gerrit user]

 sw/source/uibase/utlui/navipi.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit ab3bfb6d8c29d41384bbaddd41bfe03fe88d9e03
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jan 10 11:52:44 2019 +0000
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Tue Jan 15 21:54:09 2019 +0100

    Resolves: tdf#43220 ensure old popup is destroyed on replacement
    
    with a new one
    
    Change-Id: I0979cea429b2d1e55835ff5a65725b84b7764201
    Reviewed-on: https://gerrit.libreoffice.org/66085
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index cc6d60dcc06e..3bac5f0bcd99 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -801,6 +801,7 @@ void SwNavigationPI::dispose()
 
 void SwNavigationPI::SetPopupWindow( SfxPopupWindow* pWindow )
 {
+    m_pPopupWindow.disposeAndClear();
     m_pPopupWindow = pWindow;
     m_pPopupWindow->SetPopupModeEndHdl( LINK( this, SwNavigationPI, PopupModeEndHdl ));
     m_pPopupWindow->SetDeleteLink_Impl( LINK( this, SwNavigationPI, ClosePopupWindow ));