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

[Michael Meeks]

 sc/source/ui/view/gridwin.cxx  |    3 ++-
 sc/source/ui/view/gridwin2.cxx |    1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 88528b88bfa41d7c13c619ed0e17215924c589a9
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Tue May 19 10:30:31 2015 +0100

    tdf#91364 - fix data-pilot and auto-filter popup lifecycle.
    
    Change-Id: I6bc94025da3d6536b38cb43eef262d1d5f4c4c4c

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 9c2eaa4..5f2a06a 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -575,7 +575,7 @@ void ScGridWindow::ClickExtern()
     if (mpDPFieldPopup)
     {
         mpDPFieldPopup->close(false);
-        mpDPFieldPopup.reset();
+        mpDPFieldPopup.disposeAndClear();
     }
 }
 
@@ -705,6 +705,7 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW nRow)
     SCTAB nTab = pViewData->GetTabNo();
     ScDocument* pDoc = pViewData->GetDocument();
 
+    mpAutoFilterPopup.disposeAndClear();
     mpAutoFilterPopup.reset(VclPtr<ScCheckListMenuWindow>::Create(this, pDoc));
     mpAutoFilterPopup->setOKAction(new AutoFilterAction(this, Normal));
     mpAutoFilterPopup->setPopupEndAction(
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index 0419490..03e2150 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -455,6 +455,7 @@ void ScGridWindow::DPLaunchFieldPopupMenu(
 
     const ScDPLabelData& rLabelData = pDPData->maLabels;
 
+    mpDPFieldPopup.disposeAndClear();
     mpDPFieldPopup.reset(VclPtr<ScCheckListMenuWindow>::Create(this, pViewData->GetDocument()));
     mpDPFieldPopup->setName("DataPilot field member popup");
     mpDPFieldPopup->setExtendedData(pDPData.release());