tdf#90935 - calc / sort dialog fixage.

Change-Id: I9b33d2a6a47ba210561317679fd8514a1b5cfd11
This commit is contained in:
Michael Meeks
2015-05-07 19:08:18 +01:00
parent 893871d868
commit 94b1c8ca69
5 changed files with 19 additions and 4 deletions

View File

@@ -52,6 +52,12 @@ ScSortKeyWindow::ScSortKeyWindow(SfxTabPage* pParent, ScSortKeyItems& rSortKeyIt
ScSortKeyWindow::~ScSortKeyWindow() ScSortKeyWindow::~ScSortKeyWindow()
{ {
dispose();
}
void ScSortKeyWindow::dispose()
{
m_pBox.disposeAndClear();
mrSortKeyItems.clear(); mrSortKeyItems.clear();
} }
@@ -89,6 +95,11 @@ ScSortKeyCtrl::ScSortKeyCtrl(SfxTabPage* pParent, ScSortKeyItems& rItems)
m_rVertScroll.SetScrollHdl( aScrollLink ); m_rVertScroll.SetScrollHdl( aScrollLink );
} }
void ScSortKeyCtrl::dispose()
{
m_aSortWin.dispose();
}
void ScSortKeyCtrl::checkAutoVScroll() void ScSortKeyCtrl::checkAutoVScroll()
{ {
WinBits nBits = m_rScrolledWindow.GetStyle(); WinBits nBits = m_rScrolledWindow.GetStyle();

View File

@@ -101,6 +101,8 @@ ScTabPageSortFields::~ScTabPageSortFields()
void ScTabPageSortFields::dispose() void ScTabPageSortFields::dispose()
{ {
pDlg.clear(); pDlg.clear();
maSortKeyItems.clear();
maSortKeyCtrl.dispose();
SfxTabPage::dispose(); SfxTabPage::dispose();
} }

View File

@@ -52,6 +52,7 @@ private:
public: public:
ScSortKeyWindow(SfxTabPage* pParent, ScSortKeyItems& mrSortKeyItems); ScSortKeyWindow(SfxTabPage* pParent, ScSortKeyItems& mrSortKeyItems);
~ScSortKeyWindow(); ~ScSortKeyWindow();
void dispose();
void AddSortKey( sal_uInt16 nItem ); void AddSortKey( sal_uInt16 nItem );
void DoScroll( sal_Int32 nNewPos ); void DoScroll( sal_Int32 nNewPos );
@@ -72,6 +73,7 @@ private:
public: public:
ScSortKeyCtrl(SfxTabPage* pParent, ScSortKeyItems& mrSortKeyItems); ScSortKeyCtrl(SfxTabPage* pParent, ScSortKeyItems& mrSortKeyItems);
void dispose();
void setScrollRange(); void setScrollRange();
void AddSortKey( sal_uInt16 nItem ); void AddSortKey( sal_uInt16 nItem );
}; };