1 files changed, 12 insertions, 7 deletions
diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx
index eb03c6e61e5f..28e557e08b3f 100644
--- a/sc/source/ui/inc/solveroptions.hxx
+++ b/sc/source/ui/inc/solveroptions.hxx
@@ -35,9 +35,9 @@ namespace com { namespace sun { namespace star {
 
 class ScSolverOptionsDialog : public ModalDialog
 {
-    ListBox* m_pLbEngine;
-    SvxCheckListBox* m_pLbSettings;
-    PushButton* m_pBtnEdit;
+    VclPtr<ListBox> m_pLbEngine;
+    VclPtr<SvxCheckListBox> m_pLbSettings;
+    VclPtr<PushButton> m_pBtnEdit;
 
     SvLBoxButtonData* mpCheckButtonData;
     com::sun::star::uno::Sequence<OUString> maImplNames;
@@ -61,6 +61,7 @@ public:
                            const OUString& rEngine,
                            const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProperties );
     virtual ~ScSolverOptionsDialog();
+    virtual void dispose() SAL_OVERRIDE;
 
     // already updated in selection handler
     const OUString& GetEngine() const { return maEngine; }
@@ -69,11 +70,13 @@ public:
 
 class ScSolverIntegerDialog : public ModalDialog
 {
-    VclFrame*     m_pFrame;
-    NumericField* m_pNfValue;
+    VclPtr<VclFrame>     m_pFrame;
+    VclPtr<NumericField> m_pNfValue;
 
 public:
     ScSolverIntegerDialog( vcl::Window * pParent );
+    virtual ~ScSolverIntegerDialog();
+    virtual void dispose() SAL_OVERRIDE;
 
     void        SetOptionName( const OUString& rName );
     void        SetValue( sal_Int32 nValue );
@@ -82,11 +85,13 @@ public:
 
 class ScSolverValueDialog : public ModalDialog
 {
-    VclFrame*   m_pFrame;
-    Edit*       m_pEdValue;
+    VclPtr<VclFrame>   m_pFrame;
+    VclPtr<Edit>       m_pEdValue;
 
 public:
     ScSolverValueDialog( vcl::Window * pParent );
+    virtual ~ScSolverValueDialog();
+    virtual void dispose() SAL_OVERRIDE;
 
     void        SetOptionName( const OUString& rName );
     void        SetValue( double fValue );