Lost more cleanup and fixing post re-basing.

Change-Id: Ia5317b93484d31af978a5276bc6697848130225d

7 files changed, 30 insertions, 23 deletions

diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 29b1eacfe9d3..13d81a999d76 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -187,6 +187,9 @@ void OfaMSFilterTabPage2::dispose()
     pCheckButtonData = NULL;
     m_pCheckLB.clear();
     m_pCheckLBContainer.clear();
+    aHighlightingRB.clear();
+    aShadingRB.clear();
+
     SfxTabPage::dispose();
 }
 
diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index 20b01c1916f8..8a38d43de0ce 100644
--- a/cui/source/options/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
@@ -84,8 +84,8 @@ class OfaMSFilterTabPage2 : public SfxTabPage
            sChgToFromSmartArt;
     SvLBoxButtonData*   pCheckButtonData;
 
-    RadioButton*    aHighlightingRB;
-    RadioButton*    aShadingRB;
+    VclPtr<RadioButton> aHighlightingRB;
+    VclPtr<RadioButton> aShadingRB;
 
     OfaMSFilterTabPage2( vcl::Window* pParent, const SfxItemSet& rSet );
     virtual ~OfaMSFilterTabPage2();
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index ee3e99a04b43..16edfe7179b0 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -222,7 +222,6 @@ SvxProxyTabPage::~SvxProxyTabPage()
 
 void SvxProxyTabPage::dispose()
 {
-    mpCertPathDlg.disposeAndClear();
     m_pProxyModeLB.clear();
     m_pHttpProxyFT.clear();
     m_pHttpProxyED.clear();
@@ -656,7 +655,7 @@ void SvxSecurityTabPage::dispose()
 {
     delete mpSecOptions;
     mpSecOptions = NULL;
-    mpCertPathDlg.clear();
+    mpCertPathDlg.disposeAndClear();
     mpSecOptDlg.clear();
     m_pSecurityOptionsPB.clear();
     m_pSavePasswordsCB.clear();
@@ -668,6 +667,9 @@ void SvxSecurityTabPage::dispose()
     m_pMacroSecPB.clear();
     m_pCertFrame.clear();
     m_pCertPathPB.clear();
+    m_pTSAURLsFrame.clear();
+    m_pTSAURLsPB.clear();
+
     SfxTabPage::dispose();
 }
 
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index e1cccd41a09f..6aa6d4c8afc4 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -146,8 +146,8 @@ private:
     VclPtr<VclContainer>       m_pCertFrame;
     VclPtr<PushButton>         m_pCertPathPB;
 
-    VclContainer*       m_pTSAURLsFrame;
-    PushButton*         m_pTSAURLsPB;
+    VclPtr<VclContainer>       m_pTSAURLsFrame;
+    VclPtr<PushButton>         m_pTSAURLsPB;
 
     SvtSecurityOptions*         mpSecOptions;
     VclPtr<svx::SecurityOptionsDialog> mpSecOptDlg;
diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index 9304c364e38f..c98ce9a4a76b 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -113,20 +113,11 @@ void SvxOpenCLTabPage::dispose()
         delete static_cast<OpenCLConfig::ImplMatcher*>(mpBlackList->GetEntry(i)->GetUserData());
     for ( sal_uInt16 i = 0; i < mpWhiteList->GetEntryCount(); ++i )
         delete static_cast<OpenCLConfig::ImplMatcher*>(mpWhiteList->GetEntry(i)->GetUserData());
-    mpBlackList.disposeAndClear()
-    mpWhiteList.disposeAndClear()
-}
+    mpBlackList.disposeAndClear();
+    mpWhiteList.disposeAndClear();
 
-SvxOpenCLTabPage::~SvxOpenCLTabPage()
-{
-    disposeOnce();
-}
-
-void SvxOpenCLTabPage::dispose()
-{
     mpUseOpenCL.clear();
     mpBlackListFrame.clear();
-    mpBlackList.clear();
     mpBlackListTable.clear();
     mpBlackListEdit.clear();
     mpBlackListAdd.clear();
@@ -137,11 +128,11 @@ void SvxOpenCLTabPage::dispose()
     mpVendor.clear();
     mpDrvVersion.clear();
     mpWhiteListFrame.clear();
-    mpWhiteList.clear();
     mpWhiteListTable.clear();
     mpWhiteListEdit.clear();
     mpWhiteListAdd.clear();
     mpWhiteListDelete.clear();
+
     SfxTabPage::dispose();
 }
 
diff --git a/cui/source/options/tsaurls.cxx b/cui/source/options/tsaurls.cxx
index 9db380135ed7..142ea656f045 100644
--- a/cui/source/options/tsaurls.cxx
+++ b/cui/source/options/tsaurls.cxx
@@ -67,6 +67,17 @@ IMPL_LINK_NOARG(TSAURLsDialog, OKHdl_Impl)
 
 TSAURLsDialog::~TSAURLsDialog()
 {
+    disposeOnce();
+}
+
+void TSAURLsDialog::dispose()
+{
+    m_pAddBtn.clear();
+    m_pDeleteBtn.clear();
+    m_pOKBtn.clear();
+    m_pURLListBox.clear();
+
+    ModalDialog::dispose();
 }
 
 void TSAURLsDialog::AddTSAURL(const OUString& rURL)
diff --git a/cui/source/options/tsaurls.hxx b/cui/source/options/tsaurls.hxx
index aba749181ac5..0b25238f1397 100644
--- a/cui/source/options/tsaurls.hxx
+++ b/cui/source/options/tsaurls.hxx
@@ -16,10 +16,10 @@
 class TSAURLsDialog : public ModalDialog
 {
 private:
-    ListBox* m_pURLListBox;
-    PushButton* m_pAddBtn;
-    PushButton* m_pDeleteBtn;
-    OKButton*   m_pOKBtn;
+    VclPtr<ListBox>    m_pURLListBox;
+    VclPtr<PushButton> m_pAddBtn;
+    VclPtr<PushButton> m_pDeleteBtn;
+    VclPtr<OKButton>   m_pOKBtn;
 
     DECL_LINK(AddHdl_Impl, void *);
     DECL_LINK(DeleteHdl_Impl, void *);
@@ -32,7 +32,7 @@ private:
 public:
     TSAURLsDialog(vcl::Window* pParent);
     virtual ~TSAURLsDialog();
-
+    virtual void dispose() SAL_OVERRIDE;
 };
 
 #endif