1 files changed, 13 insertions, 12 deletions

diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx
index 6f6d2c0c7d04..eaf90aa2dcfb 100644
--- a/sc/source/ui/inc/condformatdlg.hxx
+++ b/sc/source/ui/inc/condformatdlg.hxx
@@ -22,8 +22,6 @@
 #include "rangelst.hxx"
 #include "condformathelper.hxx"
 
-#include <boost/ptr_container/ptr_vector.hpp>
-#include <boost/scoped_ptr.hpp>
 #include "anyrefdg.hxx"
 
 class ScDocument;
@@ -56,21 +54,23 @@ class ScCondFormatDlg;
 class ScCondFormatList : public Control
 {
 private:
-    typedef boost::ptr_vector<ScCondFrmtEntry> EntryContainer;
+    typedef std::vector<VclPtr<ScCondFrmtEntry>> EntryContainer;
     EntryContainer maEntries;
 
     bool mbHasScrollBar;
-    boost::scoped_ptr<ScrollBar> mpScrollBar;
+    VclPtr<ScrollBar> mpScrollBar;
 
     ScDocument* mpDoc;
     ScAddress maPos;
     ScRangeList maRanges;
-    ScCondFormatDlg* mpDialogParent;
+    VclPtr<ScCondFormatDlg> mpDialogParent;
 
     void DoScroll(long nDiff);
 
 public:
     ScCondFormatList(vcl::Window* pParent, WinBits nStyle);
+    virtual ~ScCondFormatList();
+    virtual void dispose() SAL_OVERRIDE;
 
     void init(ScDocument* pDoc, ScCondFormatDlg* pDialogParent, const ScConditionalFormat* pFormat,
         const ScRangeList& rRanges, const ScAddress& rPos,
@@ -95,18 +95,18 @@ public:
 class ScCondFormatDlg : public ScAnyRefModalDlg
 {
 private:
-    PushButton* mpBtnAdd;
-    PushButton* mpBtnRemove;
-    FixedText* mpFtRange;
-    formula::RefEdit* mpEdRange;
-    formula::RefButton* mpRbRange;
+    VclPtr<PushButton> mpBtnAdd;
+    VclPtr<PushButton> mpBtnRemove;
+    VclPtr<FixedText> mpFtRange;
+    VclPtr<formula::RefEdit> mpEdRange;
+    VclPtr<formula::RefButton> mpRbRange;
 
-    ScCondFormatList* mpCondFormList;
+    VclPtr<ScCondFormatList> mpCondFormList;
 
     ScAddress maPos;
     ScDocument* mpDoc;
 
-    formula::RefEdit* mpLastEdit;
+    VclPtr<formula::RefEdit> mpLastEdit;
 
     DECL_LINK( EdRangeModifyHdl, Edit* );
 protected:
@@ -117,6 +117,7 @@ public:
     SC_DLLPUBLIC ScCondFormatDlg(vcl::Window* pWindow, ScDocument* pDoc, const ScConditionalFormat* pFormat,
             const ScRangeList& rRange, const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType);
     virtual ~ScCondFormatDlg();
+    virtual void dispose() SAL_OVERRIDE;
 
     SC_DLLPUBLIC ScConditionalFormat* GetConditionalFormat() const;