1 files changed, 15 insertions, 8 deletions

diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx
index 9b035f14d03f..661788124c3f 100644
--- a/cui/source/inc/thesdlg.hxx
+++ b/cui/source/inc/thesdlg.hxx
@@ -35,13 +35,15 @@ 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;
 
 public:
     LookUpComboBox(vcl::Window *pParent);
+    virtual ~LookUpComboBox();
+    virtual void dispose() SAL_OVERRIDE;
 
     DECL_LINK( ModifyTimer_Hdl, Timer * );
 
@@ -71,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;
@@ -98,13 +100,15 @@ 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;
 
 public:
     ReplaceEdit(vcl::Window *pParent);
+    virtual ~ReplaceEdit();
+    virtual void dispose() SAL_OVERRIDE;
 
     void init(Button *pBtn)  { m_pBtn = pBtn; }
 
@@ -116,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;
 
@@ -131,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; }