1 files changed, 14 insertions, 10 deletions

diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx
index a2dcc8580118..661788124c3f 100644
--- a/cui/source/inc/thesdlg.hxx
+++ b/cui/source/inc/thesdlg.hxx
@@ -35,7 +35,7 @@ class SvxThesaurusDialog;
 class LookUpComboBox : public ComboBox
 {
     Idle                        m_aModifyIdle;
-    SvxThesaurusDialog*         m_pDialog;
+    VclPtr<SvxThesaurusDialog>         m_pDialog;
 
     LookUpComboBox( const LookUpComboBox & ) SAL_DELETED_FUNCTION;
     LookUpComboBox& operator = ( const LookUpComboBox & ) SAL_DELETED_FUNCTION;
@@ -43,6 +43,7 @@ class LookUpComboBox : public ComboBox
 public:
     LookUpComboBox(vcl::Window *pParent);
     virtual ~LookUpComboBox();
+    virtual void dispose() SAL_OVERRIDE;
 
     DECL_LINK( ModifyTimer_Hdl, Timer * );
 
@@ -72,7 +73,7 @@ public:
 class ThesaurusAlternativesCtrl
     : public SvxCheckListBox
 {
-    SvxThesaurusDialog*     m_pDialog;
+    VclPtr<SvxThesaurusDialog>     m_pDialog;
 
     typedef std::map< const SvTreeListEntry *, AlternativesExtraData >  UserDataMap_t;
     UserDataMap_t           m_aUserData;
@@ -85,7 +86,7 @@ public:
 
     void init(SvxThesaurusDialog *pDialog);
     virtual ~ThesaurusAlternativesCtrl();
-
+    virtual void dispose() SAL_OVERRIDE;
 
     SvTreeListEntry *   AddEntry( sal_Int32 nVal, const OUString &rText, bool bIsHeader );
 
@@ -99,7 +100,7 @@ public:
 
 class ReplaceEdit : public Edit
 {
-    Button *                    m_pBtn;
+    VclPtr<Button>       m_pBtn;
 
     ReplaceEdit( const ReplaceEdit & ) SAL_DELETED_FUNCTION;
     ReplaceEdit & operator = ( const ReplaceEdit & ) SAL_DELETED_FUNCTION;
@@ -107,6 +108,7 @@ class ReplaceEdit : public Edit
 public:
     ReplaceEdit(vcl::Window *pParent);
     virtual ~ReplaceEdit();
+    virtual void dispose() SAL_OVERRIDE;
 
     void init(Button *pBtn)  { m_pBtn = pBtn; }
 
@@ -118,11 +120,11 @@ public:
 
 class SvxThesaurusDialog : public SvxStandardDialog
 {
-    PushButton*             m_pLeftBtn;
-    LookUpComboBox*         m_pWordCB;
-    ThesaurusAlternativesCtrl* m_pAlternativesCT;
-    ReplaceEdit*            m_pReplaceEdit;
-    ListBox*                m_pLangLB;
+    VclPtr<PushButton>             m_pLeftBtn;
+    VclPtr<LookUpComboBox>         m_pWordCB;
+    VclPtr<ThesaurusAlternativesCtrl> m_pAlternativesCT;
+    VclPtr<ReplaceEdit>            m_pReplaceEdit;
+    VclPtr<ListBox>                m_pLangLB;
 
     OUString                m_aErrStr;
 
@@ -133,6 +135,9 @@ class SvxThesaurusDialog : public SvxStandardDialog
     bool                    m_bWordFound;
 
 public:
+    virtual ~SvxThesaurusDialog();
+    virtual void dispose() SAL_OVERRIDE;
+
     bool                    WordFound() const { return m_bWordFound; }
     OUString                getErrStr() const { return m_aErrStr; }
 
@@ -159,7 +164,6 @@ public:
     SvxThesaurusDialog( vcl::Window* pParent,
                         css::uno::Reference< css::linguistic2::XThesaurus >  xThesaurus,
                         const OUString &rWord, LanguageType nLanguage );
-    virtual ~SvxThesaurusDialog();
 
     void            SetWindowTitle( LanguageType nLanguage );
     OUString        GetWord();