[Libreoffice-commits] core.git: sw/source

[Libreoffice Gerrit user]

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

New commits:
commit 4db0b6fc7f51fb5bfe2d61faf50a3063228da1c8
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jan 10 11:52:44 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jan 10 17:30:24 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/66084
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index 6ee69e9944a8..92af8a191dc4 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -800,6 +800,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 ));