mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#90935 - calc / sort dialog fixage.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
sc/source/ui/dbgui/sortdlg.cxx
View File

@@ -29,7 +29,7 @@ ScSortDlg::ScSortDlg(vcl::Window* pParent, const SfxItemSet* pArgSet)
, bIsHeaders(false) , bIsHeaders(false)
, bIsByRows(false) , bIsByRows(false)
{ {
AddTabPage("criteria", ScTabPageSortFields::Create, 0); AddTabPage("criteria", ScTabPageSortFields::Create, 0);
AddTabPage("options", ScTabPageSortOptions::Create, 0); AddTabPage("options", ScTabPageSortOptions::Create, 0);
} }
@@ -37,7 +37,7 @@ ScSortWarningDlg::ScSortWarningDlg(vcl::Window* pParent,
const OUString& rExtendText, const OUString& rCurrentText) const OUString& rExtendText, const OUString& rCurrentText)
: ModalDialog(pParent, "SortWarning", "modules/scalc/ui/sortwarning.ui") : ModalDialog(pParent, "SortWarning", "modules/scalc/ui/sortwarning.ui")
{ {
get(aFtText, "sorttext" ); get( aFtText, "sorttext" );
get( aBtnExtSort, "extend" ); get( aBtnExtSort, "extend" );
get( aBtnCurSort, "current" ); get( aBtnCurSort, "current" );

11
sc/source/ui/dbgui/sortkeydlg.cxx
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();

2
sc/source/ui/dbgui/tpsort.cxx
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();
} }

4
sc/source/ui/inc/sortkeydlg.hxx
View File

@@ -44,7 +44,7 @@ typedef boost::ptr_vector<ScSortKeyItem> ScSortKeyItems;
class ScSortKeyWindow class ScSortKeyWindow
{ {
private: private:
VclPtr<VclBox> m_pBox; VclPtr<VclBox> m_pBox;
sal_Int32 nItemHeight; sal_Int32 nItemHeight;
ScSortKeyItems& mrSortKeyItems; ScSortKeyItems& mrSortKeyItems;
@@ -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 );
}; };

2
sc/source/ui/inc/tpsort.hxx
View File

@@ -72,7 +72,7 @@ private:
OUString aStrRow; OUString aStrRow;
const sal_uInt16 nWhichSort; const sal_uInt16 nWhichSort;
VclPtr<ScSortDlg> pDlg; VclPtr<ScSortDlg> pDlg;
ScViewData* pViewData; ScViewData* pViewData;
ScSortParam aSortData; ScSortParam aSortData;
std::vector<SCCOLROW> nFieldArr; std::vector<SCCOLROW> nFieldArr;