Step towards disposing of ScDataFormDlg properly

There were some VclPtrs hiding inside std::vector (twice), so fix
that, but the destructor is still not called (getting Window::~Window
inconsistency assert). With this patch however the screenshot cppunit
test no longer fails

Thanks noelgrandin for help

Change-Id: I8b46c4608cbab2070e36ef4abec226bcd997425e
Reviewed-on: https://gerrit.libreoffice.org/26772
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

1 files changed, 7 insertions, 1 deletions

diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx
index 64dd5de5e165..f1d8f636a18f 100644
--- a/sc/source/ui/miscdlgs/datafdlg.cxx
+++ b/sc/source/ui/miscdlgs/datafdlg.cxx
@@ -216,8 +216,14 @@ void ScDataFormDlg::dispose()
     m_pBtnNext.clear();
     m_pBtnClose.clear();
     m_pSlider.clear();
-    m_pGrid.clear();
     m_pFixedText.clear();
+    for ( auto aFTIter = maFixedTexts.begin(); aFTIter != maFixedTexts.end(); ++aFTIter )
+        aFTIter->disposeAndClear();
+    for ( auto aEditIter = maEdits.begin(); aEditIter != maEdits.end(); ++aEditIter )
+        aEditIter->disposeAndClear();
+    maFixedTexts.clear();
+    maEdits.clear();
+    m_pGrid.clear();
     ModalDialog::dispose();
 }