diff options
author | Michael Meeks <michael.meeks@collabora.com> | 2015-05-07 19:08:18 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2015-05-07 19:59:42 +0100 |
commit | 94b1c8ca69c888aa15e5736f70a966dfc04273ca (patch) | |
tree | 0712ecdaef73cf85f10913d8fb5bea6eaf16abcc /sc/source/ui/dbgui | |
parent | 893871d86870708a0b2166eb1f583fe65b21a1b6 (diff) |
tdf#90935 - calc / sort dialog fixage.
Change-Id: I9b33d2a6a47ba210561317679fd8514a1b5cfd11
Diffstat (limited to 'sc/source/ui/dbgui')
-rw-r--r-- | sc/source/ui/dbgui/sortdlg.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/dbgui/sortkeydlg.cxx | 11 | ||||
-rw-r--r-- | sc/source/ui/dbgui/tpsort.cxx | 2 |
3 files changed, 15 insertions, 2 deletions
diff --git a/sc/source/ui/dbgui/sortdlg.cxx b/sc/source/ui/dbgui/sortdlg.cxx index 4702a0615c0a..35848bfdbe23 100644 --- a/sc/source/ui/dbgui/sortdlg.cxx +++ b/sc/source/ui/dbgui/sortdlg.cxx @@ -29,7 +29,7 @@ ScSortDlg::ScSortDlg(vcl::Window* pParent, const SfxItemSet* pArgSet) , bIsHeaders(false) , bIsByRows(false) { - AddTabPage("criteria", ScTabPageSortFields::Create, 0); + AddTabPage("criteria", ScTabPageSortFields::Create, 0); AddTabPage("options", ScTabPageSortOptions::Create, 0); } @@ -37,7 +37,7 @@ ScSortWarningDlg::ScSortWarningDlg(vcl::Window* pParent, const OUString& rExtendText, const OUString& rCurrentText) : ModalDialog(pParent, "SortWarning", "modules/scalc/ui/sortwarning.ui") { - get(aFtText, "sorttext" ); + get( aFtText, "sorttext" ); get( aBtnExtSort, "extend" ); get( aBtnCurSort, "current" ); diff --git a/sc/source/ui/dbgui/sortkeydlg.cxx b/sc/source/ui/dbgui/sortkeydlg.cxx index e0518cd06d7f..6ffbf109b1ea 100644 --- a/sc/source/ui/dbgui/sortkeydlg.cxx +++ b/sc/source/ui/dbgui/sortkeydlg.cxx @@ -52,6 +52,12 @@ ScSortKeyWindow::ScSortKeyWindow(SfxTabPage* pParent, ScSortKeyItems& rSortKeyIt ScSortKeyWindow::~ScSortKeyWindow() { + dispose(); +} + +void ScSortKeyWindow::dispose() +{ + m_pBox.disposeAndClear(); mrSortKeyItems.clear(); } @@ -89,6 +95,11 @@ ScSortKeyCtrl::ScSortKeyCtrl(SfxTabPage* pParent, ScSortKeyItems& rItems) m_rVertScroll.SetScrollHdl( aScrollLink ); } +void ScSortKeyCtrl::dispose() +{ + m_aSortWin.dispose(); +} + void ScSortKeyCtrl::checkAutoVScroll() { WinBits nBits = m_rScrolledWindow.GetStyle(); diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index 5b34cdf27bd2..68fbc944025c 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -101,6 +101,8 @@ ScTabPageSortFields::~ScTabPageSortFields() void ScTabPageSortFields::dispose() { pDlg.clear(); + maSortKeyItems.clear(); + maSortKeyCtrl.dispose(); SfxTabPage::dispose(); } |