cui/source/customize/cfg.cxx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
New commits: commit 65376dad896d5dfc1fd6665fc5fdd1833007ce20 Author: Michael Meeks <[email protected]> Date: Thu May 7 16:38:17 2015 +0100 tdf#90935 - fix dispose ordering for tools->customize dialog. Change-Id: I1ddd3b804f82438e08ea7761a205fc4b784cdf00 diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index aa5bf2a..89d5b4c 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1568,14 +1568,15 @@ void SvxConfigPage::dispose() m_pContents.clear(); m_pContentsLabel.clear(); m_pEntries.clear(); - m_pContentsListBox.disposeAndClear(); m_pAddCommandsButton.clear(); m_pModifyCommandButton.clear(); m_pMoveUpButton.clear(); m_pMoveDownButton.clear(); m_pSaveInListBox.clear(); m_pDescriptionField.clear(); + m_pSelectorDlg.disposeAndClear(); + m_pContentsListBox.disposeAndClear(); SfxTabPage::dispose(); } @@ -2272,8 +2273,6 @@ void SvxMenuConfigPage::dispose() } m_pSaveInListBox->Clear(); - m_pSelectorDlg.clear(); - m_pContentsListBox.clear(); SvxConfigPage::dispose(); } @@ -2974,8 +2973,6 @@ void SvxToolbarConfigPage::dispose() } m_pSaveInListBox->Clear(); - m_pSelectorDlg.disposeAndClear(); - m_pContentsListBox.disposeAndClear(); SvxConfigPage::dispose(); } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
