1 files changed, 8 insertions, 7 deletions
diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx
index 6cfecdfc246f..5cdf8b7a10fe 100644
--- a/svx/source/tbxctrls/colorwindow.hxx
+++ b/svx/source/tbxctrls/colorwindow.hxx
@@ -37,13 +37,13 @@ class SvxColorWindow_Impl : public SfxPopupWindow
 
 private:
     const sal_uInt16    theSlotId;
-    SvxColorValueSet*   mpColorSet;
-    SvxColorValueSet*   mpRecentColorSet;
+    VclPtr<SvxColorValueSet>   mpColorSet;
+    VclPtr<SvxColorValueSet>   mpRecentColorSet;
 
-    ListBox*            mpPaletteListBox;
-    PushButton*         mpButtonAutoColor;
-    PushButton*         mpButtonPicker;
-    FixedLine*          mpAutomaticSeparator;
+    VclPtr<ListBox>     mpPaletteListBox;
+    VclPtr<PushButton>  mpButtonAutoColor;
+    VclPtr<PushButton>  mpButtonPicker;
+    VclPtr<FixedLine>   mpAutomaticSeparator;
     OUString            maCommand;
     Link                maSelectedLink;
 
@@ -68,12 +68,13 @@ public:
                          const OUString& rWndTitle,
                          vcl::Window* pParentWindow);
     virtual ~SvxColorWindow_Impl();
+    virtual void        dispose() SAL_OVERRIDE;
     void                StartSelection();
 
     virtual void        KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
     virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE;
 
-    virtual SfxPopupWindow* Clone() const SAL_OVERRIDE;
+    virtual VclPtr<SfxPopupWindow> Clone() const SAL_OVERRIDE;
     void SetSelectedHdl( const Link& rLink ) { maSelectedLink = rLink; }
 };