1 files changed, 25 insertions, 22 deletions

diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index 4b45f37265ea..ffe299b7c628 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -51,17 +51,17 @@ class   SvxJavaListBox;
 class SvxJavaOptionsPage : public SfxTabPage
 {
 private:
-    CheckBox*                   m_pJavaEnableCB;
-    VclContainer*               m_pJavaBox;
-    SvxJavaListBox*             m_pJavaList;
-    FixedText*                  m_pJavaPathText;
-    PushButton*                 m_pAddBtn;
-    PushButton*                 m_pParameterBtn;
-    PushButton*                 m_pClassPathBtn;
-    PushButton*                 m_pExpertConfigBtn;
-
-    SvxJavaParameterDlg*    m_pParamDlg;
-    SvxJavaClassPathDlg*    m_pPathDlg;
+    VclPtr<CheckBox>                   m_pJavaEnableCB;
+    VclPtr<VclContainer>               m_pJavaBox;
+    VclPtr<SvxJavaListBox>             m_pJavaList;
+    VclPtr<FixedText>                  m_pJavaPathText;
+    VclPtr<PushButton>                 m_pAddBtn;
+    VclPtr<PushButton>                 m_pParameterBtn;
+    VclPtr<PushButton>                 m_pClassPathBtn;
+    VclPtr<PushButton>                 m_pExpertConfigBtn;
+
+    VclPtr<SvxJavaParameterDlg>        m_pParamDlg;
+    VclPtr<SvxJavaClassPathDlg>        m_pPathDlg;
 
 #if HAVE_FEATURE_JAVA
     JavaInfo**              m_parJavaInfo;
@@ -75,8 +75,8 @@ private:
     OUString                m_sAddDialogText;
     Idle                    m_aResetIdle;
 
-    CheckBox*               m_pExperimentalCB;
-    CheckBox*               m_pMacroCB;
+    VclPtr<CheckBox>               m_pExperimentalCB;
+    VclPtr<CheckBox>               m_pMacroCB;
 
     ::std::vector< JavaInfo* >
                             m_aAddedInfos;
@@ -107,8 +107,9 @@ private:
 public:
     SvxJavaOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet );
     virtual ~SvxJavaOptionsPage();
+    virtual void            dispose() SAL_OVERRIDE;
 
-    static SfxTabPage*      Create( vcl::Window* pParent, const SfxItemSet* rSet );
+    static VclPtr<SfxTabPage>      Create( vcl::Window* pParent, const SfxItemSet* rSet );
 
     virtual bool            FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void            Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -120,11 +121,11 @@ public:
 class SvxJavaParameterDlg : public ModalDialog
 {
 private:
-    Edit*                   m_pParameterEdit;
-    PushButton*             m_pAssignBtn;
+    VclPtr<Edit>                   m_pParameterEdit;
+    VclPtr<PushButton>             m_pAssignBtn;
 
-    ListBox*                m_pAssignedList;
-    PushButton*             m_pRemoveBtn;
+    VclPtr<ListBox>                m_pAssignedList;
+    VclPtr<PushButton>             m_pRemoveBtn;
 
     DECL_LINK(ModifyHdl_Impl, void *);
     DECL_LINK(AssignHdl_Impl, void *);
@@ -141,6 +142,7 @@ private:
 public:
     SvxJavaParameterDlg( vcl::Window* pParent );
     virtual ~SvxJavaParameterDlg();
+    virtual void dispose() SAL_OVERRIDE;
 
     virtual short           Execute() SAL_OVERRIDE;
 
@@ -153,10 +155,10 @@ public:
 class SvxJavaClassPathDlg : public ModalDialog
 {
 private:
-    ListBox*                 m_pPathList;
-    PushButton*              m_pAddArchiveBtn;
-    PushButton*              m_pAddPathBtn;
-    PushButton*              m_pRemoveBtn;
+    VclPtr<ListBox>                 m_pPathList;
+    VclPtr<PushButton>              m_pAddArchiveBtn;
+    VclPtr<PushButton>              m_pAddPathBtn;
+    VclPtr<PushButton>              m_pRemoveBtn;
 
     OUString                m_sOldPath;
 
@@ -173,6 +175,7 @@ private:
 public:
     SvxJavaClassPathDlg( vcl::Window* pParent );
     virtual ~SvxJavaClassPathDlg();
+    virtual void            dispose() SAL_OVERRIDE;
 
     inline const OUString&  GetOldPath() const { return m_sOldPath; }
     inline void             SetFocus() { m_pPathList->GrabFocus(); }