Kaydet (Commit) 65376dad authored tarafından Michael Meeks's avatar Michael Meeks

tdf#90935 - fix dispose ordering for tools->customize dialog.

Change-Id: I1ddd3b804f82438e08ea7761a205fc4b784cdf00
üst d6e5c52c
...@@ -1568,14 +1568,15 @@ void SvxConfigPage::dispose() ...@@ -1568,14 +1568,15 @@ void SvxConfigPage::dispose()
m_pContents.clear(); m_pContents.clear();
m_pContentsLabel.clear(); m_pContentsLabel.clear();
m_pEntries.clear(); m_pEntries.clear();
m_pContentsListBox.disposeAndClear();
m_pAddCommandsButton.clear(); m_pAddCommandsButton.clear();
m_pModifyCommandButton.clear(); m_pModifyCommandButton.clear();
m_pMoveUpButton.clear(); m_pMoveUpButton.clear();
m_pMoveDownButton.clear(); m_pMoveDownButton.clear();
m_pSaveInListBox.clear(); m_pSaveInListBox.clear();
m_pDescriptionField.clear(); m_pDescriptionField.clear();
m_pSelectorDlg.disposeAndClear(); m_pSelectorDlg.disposeAndClear();
m_pContentsListBox.disposeAndClear();
SfxTabPage::dispose(); SfxTabPage::dispose();
} }
...@@ -2272,8 +2273,6 @@ void SvxMenuConfigPage::dispose() ...@@ -2272,8 +2273,6 @@ void SvxMenuConfigPage::dispose()
} }
m_pSaveInListBox->Clear(); m_pSaveInListBox->Clear();
m_pSelectorDlg.clear();
m_pContentsListBox.clear();
SvxConfigPage::dispose(); SvxConfigPage::dispose();
} }
...@@ -2974,8 +2973,6 @@ void SvxToolbarConfigPage::dispose() ...@@ -2974,8 +2973,6 @@ void SvxToolbarConfigPage::dispose()
} }
m_pSaveInListBox->Clear(); m_pSaveInListBox->Clear();
m_pSelectorDlg.disposeAndClear();
m_pContentsListBox.disposeAndClear();
SvxConfigPage::dispose(); SvxConfigPage::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