Kaydet (Commit) ec695649 authored tarafından Katarina Behrens's avatar Katarina Behrens Kaydeden (comit) Noel Grandin

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/26772Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 6f34143d
...@@ -216,8 +216,14 @@ void ScDataFormDlg::dispose() ...@@ -216,8 +216,14 @@ void ScDataFormDlg::dispose()
m_pBtnNext.clear(); m_pBtnNext.clear();
m_pBtnClose.clear(); m_pBtnClose.clear();
m_pSlider.clear(); m_pSlider.clear();
m_pGrid.clear();
m_pFixedText.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(); ModalDialog::dispose();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment