[Libreoffice-commits] core.git: sc/source

[Michael Meeks]

 sc/source/ui/dbgui/sortdlg.cxx    |    4 ++--
 sc/source/ui/dbgui/sortkeydlg.cxx |   11 +++++++++++
 sc/source/ui/dbgui/tpsort.cxx     |    2 ++
 sc/source/ui/inc/sortkeydlg.hxx   |    4 +++-
 sc/source/ui/inc/tpsort.hxx       |    2 +-
 5 files changed, 19 insertions(+), 4 deletions(-)

New commits:
commit 94b1c8ca69c888aa15e5736f70a966dfc04273ca
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Thu May 7 19:08:18 2015 +0100

    tdf#90935 - calc / sort dialog fixage.
    
    Change-Id: I9b33d2a6a47ba210561317679fd8514a1b5cfd11

diff --git a/sc/source/ui/dbgui/sortdlg.cxx b/sc/source/ui/dbgui/sortdlg.cxx
index 4702a06..35848bf 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 e0518cd..6ffbf10 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 5b34cdf..68fbc94 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();
 }
 
diff --git a/sc/source/ui/inc/sortkeydlg.hxx b/sc/source/ui/inc/sortkeydlg.hxx
index a0a027c..07c1273 100644
--- a/sc/source/ui/inc/sortkeydlg.hxx
+++ b/sc/source/ui/inc/sortkeydlg.hxx
@@ -44,7 +44,7 @@ typedef boost::ptr_vector<ScSortKeyItem> ScSortKeyItems;
 class ScSortKeyWindow
 {
 private:
-    VclPtr<VclBox>         m_pBox;
+    VclPtr<VclBox>  m_pBox;
     sal_Int32       nItemHeight;
 
     ScSortKeyItems& mrSortKeyItems;
@@ -52,6 +52,7 @@ private:
 public:
     ScSortKeyWindow(SfxTabPage* pParent, ScSortKeyItems& mrSortKeyItems);
     ~ScSortKeyWindow();
+    void dispose();
 
     void AddSortKey( sal_uInt16 nItem );
     void DoScroll( sal_Int32 nNewPos );
@@ -72,6 +73,7 @@ private:
 
 public:
     ScSortKeyCtrl(SfxTabPage* pParent, ScSortKeyItems& mrSortKeyItems);
+    void dispose();
     void setScrollRange();
     void AddSortKey( sal_uInt16 nItem );
 };
diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx
index 82ad52dd..631ccc6 100644
--- a/sc/source/ui/inc/tpsort.hxx
+++ b/sc/source/ui/inc/tpsort.hxx
@@ -72,7 +72,7 @@ private:
     OUString            aStrRow;
 
     const sal_uInt16    nWhichSort;
-    VclPtr<ScSortDlg>          pDlg;
+    VclPtr<ScSortDlg>   pDlg;
     ScViewData*         pViewData;
     ScSortParam         aSortData;
     std::vector<SCCOLROW>  nFieldArr;