vcl: VclPtr conversion in sc

Change-Id: I9cbc8beff7172c1ec69ae1124b16de0c0d722334

Conflicts:
sc/source/ui/view/gridwin.cxx
sc/source/ui/view/tabview.cxx

6 files changed, 130 insertions, 97 deletions

diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
index 08f7417bea08..72bd59eae8bc 100644
--- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
@@ -45,11 +45,11 @@ namespace sc { namespace sidebar {
 CellBorderStyleControl::CellBorderStyleControl(vcl::Window* pParent, CellAppearancePropertyPanel& rPanel)
 :   svx::sidebar::PopupControl(pParent, ScResId(RID_POPUPPANEL_APPEARANCE_CELL_BORDERSTYLE)),
     mrCellAppearancePropertyPanel(rPanel),
-    maTBBorder1(this, ScResId(TB_BORDER1)),
-    maTBBorder2(this, ScResId(TB_BORDER2)),
-    maTBBorder3(this, ScResId(TB_BORDER3)),
-    maFL1(this, ScResId(FL_1)),
-    maFL2(this, ScResId(FL_2)),
+    maTBBorder1(new ToolBox(this, ScResId(TB_BORDER1))),
+    maTBBorder2(new ToolBox(this, ScResId(TB_BORDER2))),
+    maTBBorder3(new ToolBox(this, ScResId(TB_BORDER3))),
+    maFL1(new FixedLine(this, ScResId(FL_1))),
+    maFL2(new FixedLine(this, ScResId(FL_2))),
     mpImageList(0)
 {
     Initialize();
@@ -58,7 +58,18 @@ CellBorderStyleControl::CellBorderStyleControl(vcl::Window* pParent, CellAppeara
 
 CellBorderStyleControl::~CellBorderStyleControl(void)
 {
+    dispose();
+}
+
+void CellBorderStyleControl::dispose()
+{
     delete[] mpImageList;
+    maTBBorder1.disposeAndClear();
+    maTBBorder2.disposeAndClear();
+    maTBBorder3.disposeAndClear();
+    maFL1.disposeAndClear();
+    maFL2.disposeAndClear();
+    svx::sidebar::PopupControl::dispose();
 }
 
 void CellBorderStyleControl::Initialize()
@@ -81,60 +92,60 @@ void CellBorderStyleControl::Initialize()
     mpImageList[14] = Image(ScResId(IMG_BORDER15));
     mpImageList[15] = Image(ScResId(IMG_BORDER16));
 
-    maTBBorder1.SetItemImage(TBI_BORDER1_NONE, mpImageList[0]);
-    maTBBorder1.SetItemImage(TBI_BORDER1_ALL, mpImageList[1]);
-    maTBBorder1.SetItemImage(TBI_BORDER1_OUTER, mpImageList[2]);
-    maTBBorder1.SetItemImage(TBI_BORDER1_OUTERBOLD, mpImageList[3]);
-    maTBBorder1.SetBackground(Wallpaper());
-    maTBBorder1.SetPaintTransparent(true);
-    Size aTbxSize( maTBBorder1.CalcWindowSizePixel() );
-    maTBBorder1.SetOutputSizePixel( aTbxSize );
+    maTBBorder1->SetItemImage(TBI_BORDER1_NONE, mpImageList[0]);
+    maTBBorder1->SetItemImage(TBI_BORDER1_ALL, mpImageList[1]);
+    maTBBorder1->SetItemImage(TBI_BORDER1_OUTER, mpImageList[2]);
+    maTBBorder1->SetItemImage(TBI_BORDER1_OUTERBOLD, mpImageList[3]);
+    maTBBorder1->SetBackground(Wallpaper());
+    maTBBorder1->SetPaintTransparent(true);
+    Size aTbxSize( maTBBorder1->CalcWindowSizePixel() );
+    maTBBorder1->SetOutputSizePixel( aTbxSize );
     Link aLink  = LINK(this, CellBorderStyleControl, TB1SelectHdl);
-    maTBBorder1.SetSelectHdl ( aLink );
+    maTBBorder1->SetSelectHdl ( aLink );
 
-    maTBBorder2.SetLineCount(2);
-    maTBBorder2.InsertItem(TBI_BORDER2_LEFT, mpImageList[4]);
-    maTBBorder2.InsertItem(TBI_BORDER2_RIGHT, mpImageList[5]);
-    maTBBorder2.InsertItem(TBI_BORDER2_TOP, mpImageList[6]);
-    maTBBorder2.InsertItem(TBI_BORDER2_BOT, mpImageList[7]);
-    maTBBorder2.InsertBreak();
-    maTBBorder2.InsertItem(TBI_BORDER2_BLTR, mpImageList[8]);
-    maTBBorder2.InsertItem(TBI_BORDER2_TLBR, mpImageList[9]);
-    maTBBorder2.InsertItem(TBI_BORDER2_TOPBOT, mpImageList[10]);
-    maTBBorder2.InsertItem(TBI_BORDER2_LEFTRIGHT, mpImageList[11]);
-    maTBBorder2.SetBackground(Wallpaper());
-    maTBBorder2.SetPaintTransparent(true);
-    aTbxSize = maTBBorder2.CalcWindowSizePixel() ;
-    maTBBorder2.SetOutputSizePixel( aTbxSize );
-    maTBBorder2.SetHelpId(TBI_BORDER2_LEFT, HID_PROPERTYPANEL_SC_BORDER_TBI_LEFT);
-    maTBBorder2.SetHelpId(TBI_BORDER2_RIGHT, HID_PROPERTYPANEL_SC_BORDER_TBI_RIGHT);
-    maTBBorder2.SetHelpId(TBI_BORDER2_TOP, HID_PROPERTYPANEL_SC_BORDER_TBI_TOP);
-    maTBBorder2.SetHelpId(TBI_BORDER2_BOT, HID_PROPERTYPANEL_SC_BORDER_TBI_BOT);
-    maTBBorder2.SetHelpId(TBI_BORDER2_BLTR, HID_PROPERTYPANEL_SC_BORDER_TBI_BLTR);
-    maTBBorder2.SetHelpId(TBI_BORDER2_TLBR, HID_PROPERTYPANEL_SC_BORDER_TBI_TLBR);
-    maTBBorder2.SetHelpId(TBI_BORDER2_TOPBOT, HID_PROPERTYPANEL_SC_BORDER_TBI_TOPBOT);
-    maTBBorder2.SetHelpId(TBI_BORDER2_LEFTRIGHT, HID_PROPERTYPANEL_SC_BORDER_TBI_LEFTRIGHT);
-    maTBBorder2.SetItemText(TBI_BORDER2_LEFT, ScResId(STR_BORDER_1));
-    maTBBorder2.SetItemText(TBI_BORDER2_RIGHT, ScResId(STR_BORDER_2));
-    maTBBorder2.SetItemText(TBI_BORDER2_TOP, ScResId(STR_BORDER_3));
-    maTBBorder2.SetItemText(TBI_BORDER2_BOT, ScResId(STR_BORDER_4));
-    maTBBorder2.SetItemText(TBI_BORDER2_BLTR, ScResId(STR_BORDER_5));
-    maTBBorder2.SetItemText(TBI_BORDER2_TLBR, ScResId(STR_BORDER_6));
-    maTBBorder2.SetItemText(TBI_BORDER2_TOPBOT, ScResId(STR_BORDER_7));
-    maTBBorder2.SetItemText(TBI_BORDER2_LEFTRIGHT, ScResId(STR_BORDER_8));
+    maTBBorder2->SetLineCount(2);
+    maTBBorder2->InsertItem(TBI_BORDER2_LEFT, mpImageList[4]);
+    maTBBorder2->InsertItem(TBI_BORDER2_RIGHT, mpImageList[5]);
+    maTBBorder2->InsertItem(TBI_BORDER2_TOP, mpImageList[6]);
+    maTBBorder2->InsertItem(TBI_BORDER2_BOT, mpImageList[7]);
+    maTBBorder2->InsertBreak();
+    maTBBorder2->InsertItem(TBI_BORDER2_BLTR, mpImageList[8]);
+    maTBBorder2->InsertItem(TBI_BORDER2_TLBR, mpImageList[9]);
+    maTBBorder2->InsertItem(TBI_BORDER2_TOPBOT, mpImageList[10]);
+    maTBBorder2->InsertItem(TBI_BORDER2_LEFTRIGHT, mpImageList[11]);
+    maTBBorder2->SetBackground(Wallpaper());
+    maTBBorder2->SetPaintTransparent(true);
+    aTbxSize = maTBBorder2->CalcWindowSizePixel() ;
+    maTBBorder2->SetOutputSizePixel( aTbxSize );
+    maTBBorder2->SetHelpId(TBI_BORDER2_LEFT, HID_PROPERTYPANEL_SC_BORDER_TBI_LEFT);
+    maTBBorder2->SetHelpId(TBI_BORDER2_RIGHT, HID_PROPERTYPANEL_SC_BORDER_TBI_RIGHT);
+    maTBBorder2->SetHelpId(TBI_BORDER2_TOP, HID_PROPERTYPANEL_SC_BORDER_TBI_TOP);
+    maTBBorder2->SetHelpId(TBI_BORDER2_BOT, HID_PROPERTYPANEL_SC_BORDER_TBI_BOT);
+    maTBBorder2->SetHelpId(TBI_BORDER2_BLTR, HID_PROPERTYPANEL_SC_BORDER_TBI_BLTR);
+    maTBBorder2->SetHelpId(TBI_BORDER2_TLBR, HID_PROPERTYPANEL_SC_BORDER_TBI_TLBR);
+    maTBBorder2->SetHelpId(TBI_BORDER2_TOPBOT, HID_PROPERTYPANEL_SC_BORDER_TBI_TOPBOT);
+    maTBBorder2->SetHelpId(TBI_BORDER2_LEFTRIGHT, HID_PROPERTYPANEL_SC_BORDER_TBI_LEFTRIGHT);
+    maTBBorder2->SetItemText(TBI_BORDER2_LEFT, ScResId(STR_BORDER_1));
+    maTBBorder2->SetItemText(TBI_BORDER2_RIGHT, ScResId(STR_BORDER_2));
+    maTBBorder2->SetItemText(TBI_BORDER2_TOP, ScResId(STR_BORDER_3));
+    maTBBorder2->SetItemText(TBI_BORDER2_BOT, ScResId(STR_BORDER_4));
+    maTBBorder2->SetItemText(TBI_BORDER2_BLTR, ScResId(STR_BORDER_5));
+    maTBBorder2->SetItemText(TBI_BORDER2_TLBR, ScResId(STR_BORDER_6));
+    maTBBorder2->SetItemText(TBI_BORDER2_TOPBOT, ScResId(STR_BORDER_7));
+    maTBBorder2->SetItemText(TBI_BORDER2_LEFTRIGHT, ScResId(STR_BORDER_8));
     aLink  = LINK(this, CellBorderStyleControl, TB2SelectHdl);
-    maTBBorder2.SetSelectHdl ( aLink );
+    maTBBorder2->SetSelectHdl ( aLink );
 
-    maTBBorder3.SetItemImage(TBI_BORDER3_S1, mpImageList[12]);
-    maTBBorder3.SetItemImage(TBI_BORDER3_S2, mpImageList[13]);
-    maTBBorder3.SetItemImage(TBI_BORDER3_S3, mpImageList[14]);
-    maTBBorder3.SetItemImage(TBI_BORDER3_S4, mpImageList[15]);
-    maTBBorder3.SetBackground(Wallpaper());
-    maTBBorder3.SetPaintTransparent(true);
-    aTbxSize = maTBBorder3.CalcWindowSizePixel() ;
-    maTBBorder3.SetOutputSizePixel( aTbxSize );
+    maTBBorder3->SetItemImage(TBI_BORDER3_S1, mpImageList[12]);
+    maTBBorder3->SetItemImage(TBI_BORDER3_S2, mpImageList[13]);
+    maTBBorder3->SetItemImage(TBI_BORDER3_S3, mpImageList[14]);
+    maTBBorder3->SetItemImage(TBI_BORDER3_S4, mpImageList[15]);
+    maTBBorder3->SetBackground(Wallpaper());
+    maTBBorder3->SetPaintTransparent(true);
+    aTbxSize = maTBBorder3->CalcWindowSizePixel() ;
+    maTBBorder3->SetOutputSizePixel( aTbxSize );
     aLink  = LINK(this, CellBorderStyleControl, TB3SelectHdl);
-    maTBBorder3.SetSelectHdl ( aLink );
+    maTBBorder3->SetSelectHdl ( aLink );
 }
 
 IMPL_LINK(CellBorderStyleControl, TB1SelectHdl, ToolBox*, pToolBox)
diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.hxx b/sc/source/ui/sidebar/CellBorderStyleControl.hxx
index 7cf04e2d68fd..706d10e7b11c 100644
--- a/sc/source/ui/sidebar/CellBorderStyleControl.hxx
+++ b/sc/source/ui/sidebar/CellBorderStyleControl.hxx
@@ -32,11 +32,11 @@ class CellBorderStyleControl : public svx::sidebar::PopupControl
 {
 private:
     CellAppearancePropertyPanel&    mrCellAppearancePropertyPanel;
-    ToolBox                         maTBBorder1;
-    ToolBox                         maTBBorder2;
-    ToolBox                         maTBBorder3;
-    FixedLine                       maFL1;
-    FixedLine                       maFL2;
+    VclPtr<ToolBox>                 maTBBorder1;
+    VclPtr<ToolBox>                 maTBBorder2;
+    VclPtr<ToolBox>                 maTBBorder3;
+    VclPtr<FixedLine>               maFL1;
+    VclPtr<FixedLine>               maFL2;
     Image*                          mpImageList;
 
     void Initialize();
@@ -47,7 +47,8 @@ private:
 
 public:
     CellBorderStyleControl(vcl::Window* pParent, CellAppearancePropertyPanel& rPanel);
-    virtual ~CellBorderStyleControl(void);
+    virtual ~CellBorderStyleControl();
+    virtual void dispose() SAL_OVERRIDE;
 };
 
 } } // end of namespace svx::sidebar
diff --git a/sc/source/ui/sidebar/CellLineStyleControl.cxx b/sc/source/ui/sidebar/CellLineStyleControl.cxx
index ac4d3467327b..187cbed1111d 100644
--- a/sc/source/ui/sidebar/CellLineStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellLineStyleControl.cxx
@@ -36,27 +36,39 @@ namespace sc { namespace sidebar {
 CellLineStyleControl::CellLineStyleControl(vcl::Window* pParent, CellAppearancePropertyPanel& rPanel)
 :   svx::sidebar::PopupControl(pParent, ScResId(RID_POPUPPANEL_APPEARANCE_CELL_LINESTYLE)),
     mrCellAppearancePropertyPanel(rPanel),
-    maPushButtonMoreOptions(this, ScResId(PB_OPTIONS)),
-    maCellLineStyleValueSet(this, ScResId(VS_STYLE)),
+    maPushButtonMoreOptions(new PushButton(this, ScResId(PB_OPTIONS))),
+    maCellLineStyleValueSet(new sc::sidebar::CellLineStyleValueSet(this, ScResId(VS_STYLE))),
     mbVSfocus(true)
 {
     Initialize();
     FreeResource();
 }
 
+CellLineStyleControl::~CellLineStyleControl()
+{
+    dispose();
+}
+
+void CellLineStyleControl::dispose()
+{
+    maPushButtonMoreOptions.disposeAndClear();
+    maCellLineStyleValueSet.disposeAndClear();
+    svx::sidebar::PopupControl::dispose();
+}
+
 void CellLineStyleControl::Initialize()
 {
-    //maPushButtonMoreOptions.SetIcoPosX(2);
+    //maPushButtonMoreOptions->SetIcoPosX(2);
     Link aLink = LINK(this, CellLineStyleControl, PBClickHdl);
-    maPushButtonMoreOptions.SetClickHdl(aLink);
+    maPushButtonMoreOptions->SetClickHdl(aLink);
 
-    maCellLineStyleValueSet.SetStyle(maCellLineStyleValueSet.GetStyle()| WB_3DLOOK |  WB_NO_DIRECTSELECT);
-    maCellLineStyleValueSet.SetControlBackground(GetSettings().GetStyleSettings().GetMenuColor());
-    maCellLineStyleValueSet.SetColor(GetSettings().GetStyleSettings().GetMenuColor());
+    maCellLineStyleValueSet->SetStyle(maCellLineStyleValueSet->GetStyle()| WB_3DLOOK |  WB_NO_DIRECTSELECT);
+    maCellLineStyleValueSet->SetControlBackground(GetSettings().GetStyleSettings().GetMenuColor());
+    maCellLineStyleValueSet->SetColor(GetSettings().GetStyleSettings().GetMenuColor());
 
     for(sal_uInt16 i = 1 ; i <= 9 ; i++)
     {
-        maCellLineStyleValueSet.InsertItem(i);
+        maCellLineStyleValueSet->InsertItem(i);
     }
 
     maStr[0] = GetSettings().GetLocaleI18nHelper().GetNum( 5, 2 ) + "pt";
@@ -68,46 +80,46 @@ void CellLineStyleControl::Initialize()
     maStr[6] = GetSettings().GetLocaleI18nHelper().GetNum( 450, 2 ) + "pt";
     maStr[7] = GetSettings().GetLocaleI18nHelper().GetNum( 505, 2 ) + "pt";
     maStr[8] = GetSettings().GetLocaleI18nHelper().GetNum( 750, 2 ) + "pt";
-    maCellLineStyleValueSet.SetUnit(&maStr[0]);
+    maCellLineStyleValueSet->SetUnit(&maStr[0]);
 
     for (sal_uInt16 i = 1; i <= CELL_LINE_STYLE_ENTRIES; ++i)
     {
-        maCellLineStyleValueSet.SetItemText(i, maStr[i-1]);
+        maCellLineStyleValueSet->SetItemText(i, maStr[i-1]);
     }
 
     SetAllNoSel();
     aLink = LINK(this, CellLineStyleControl, VSSelectHdl);
-    maCellLineStyleValueSet.SetSelectHdl(aLink);
-    maCellLineStyleValueSet.StartSelection();
-    maCellLineStyleValueSet.Show();
+    maCellLineStyleValueSet->SetSelectHdl(aLink);
+    maCellLineStyleValueSet->StartSelection();
+    maCellLineStyleValueSet->Show();
 }
 
 void CellLineStyleControl::GetFocus()
 {
     if(!mbVSfocus)
     {
-        maPushButtonMoreOptions.GrabFocus();
+        maPushButtonMoreOptions->GrabFocus();
     }
     else
     {
-        maCellLineStyleValueSet.GrabFocus();
+        maCellLineStyleValueSet->GrabFocus();
     }
 }
 
 void CellLineStyleControl::SetAllNoSel()
 {
-    maCellLineStyleValueSet.SelectItem(0);
-    maCellLineStyleValueSet.SetNoSelection();
-    maCellLineStyleValueSet.Format();
+    maCellLineStyleValueSet->SelectItem(0);
+    maCellLineStyleValueSet->SetNoSelection();
+    maCellLineStyleValueSet->Format();
     Invalidate();
-    maCellLineStyleValueSet.StartSelection();
+    maCellLineStyleValueSet->StartSelection();
 }
 
 IMPL_LINK(CellLineStyleControl, VSSelectHdl, void *, pControl)
 {
     if(pControl == &maCellLineStyleValueSet)
     {
-        const sal_uInt16 iPos(maCellLineStyleValueSet.GetSelectItemId());
+        const sal_uInt16 iPos(maCellLineStyleValueSet->GetSelectItemId());
         SvxLineItem aLineItem(SID_FRAME_LINESTYLE);
         using namespace ::com::sun::star::table::BorderLineStyle;
         editeng::SvxBorderStyle nStyle = SOLID;
@@ -178,7 +190,7 @@ IMPL_LINK(CellLineStyleControl, VSSelectHdl, void *, pControl)
 
 IMPL_LINK(CellLineStyleControl, PBClickHdl, PushButton *, pPBtn)
 {
-    if(pPBtn == &maPushButtonMoreOptions)
+    if(pPBtn == maPushButtonMoreOptions.get())
     {
         if(mrCellAppearancePropertyPanel.GetBindings())
         {
@@ -200,48 +212,48 @@ void CellLineStyleControl::SetLineStyleSelect(sal_uInt16 out, sal_uInt16 in, sal
 
     if(out == DEF_LINE_WIDTH_0 && in == 0 && dis == 0)  //1
     {
-        maCellLineStyleValueSet.SetSelItem(1);
+        maCellLineStyleValueSet->SetSelItem(1);
     }
     else if(out == DEF_LINE_WIDTH_2 && in == 0 && dis == 0) //2
     {
-        maCellLineStyleValueSet.SetSelItem(2);
+        maCellLineStyleValueSet->SetSelItem(2);
     }
     else if(out == DEF_LINE_WIDTH_3 && in == 0 && dis == 0) //3
     {
-        maCellLineStyleValueSet.SetSelItem(3);
+        maCellLineStyleValueSet->SetSelItem(3);
     }
     else if(out == DEF_LINE_WIDTH_4 && in == 0 && dis == 0) //4
     {
-        maCellLineStyleValueSet.SetSelItem(4);
+        maCellLineStyleValueSet->SetSelItem(4);
     }
     else if(out == DEF_LINE_WIDTH_0 && in == DEF_LINE_WIDTH_0 && dis == DEF_LINE_WIDTH_1) //5
     {
-        maCellLineStyleValueSet.SetSelItem(5);
+        maCellLineStyleValueSet->SetSelItem(5);
     }
     else if(out == DEF_LINE_WIDTH_0 && in == DEF_LINE_WIDTH_0 && dis == DEF_LINE_WIDTH_2) //6
     {
-        maCellLineStyleValueSet.SetSelItem(6);
+        maCellLineStyleValueSet->SetSelItem(6);
     }
     else if(out == DEF_LINE_WIDTH_1 && in == DEF_LINE_WIDTH_2 && dis == DEF_LINE_WIDTH_1) //7
     {
-        maCellLineStyleValueSet.SetSelItem(7);
+        maCellLineStyleValueSet->SetSelItem(7);
     }
     else if(out == DEF_LINE_WIDTH_2 && in == DEF_LINE_WIDTH_0 && dis == DEF_LINE_WIDTH_2) //8
     {
-        maCellLineStyleValueSet.SetSelItem(8);
+        maCellLineStyleValueSet->SetSelItem(8);
     }
     else if(out == DEF_LINE_WIDTH_2 && in == DEF_LINE_WIDTH_2 && dis == DEF_LINE_WIDTH_2) //9
     {
-        maCellLineStyleValueSet.SetSelItem(9);
+        maCellLineStyleValueSet->SetSelItem(9);
     }
     else
     {
-        maCellLineStyleValueSet.SetSelItem(0);
+        maCellLineStyleValueSet->SetSelItem(0);
         mbVSfocus = false;
     }
 
-    maCellLineStyleValueSet.Format();
-    maCellLineStyleValueSet.StartSelection();
+    maCellLineStyleValueSet->Format();
+    maCellLineStyleValueSet->StartSelection();
 }
 
 } } // end of namespace svx::sidebar
diff --git a/sc/source/ui/sidebar/CellLineStyleControl.hxx b/sc/source/ui/sidebar/CellLineStyleControl.hxx
index a00079ac8dbd..3b772db89fd9 100644
--- a/sc/source/ui/sidebar/CellLineStyleControl.hxx
+++ b/sc/source/ui/sidebar/CellLineStyleControl.hxx
@@ -31,8 +31,8 @@ class CellLineStyleControl : public svx::sidebar::PopupControl
 {
 private:
     CellAppearancePropertyPanel&       mrCellAppearancePropertyPanel;
-    PushButton                         maPushButtonMoreOptions;
-    CellLineStyleValueSet              maCellLineStyleValueSet;
+    VclPtr<PushButton>                 maPushButtonMoreOptions;
+    VclPtr<CellLineStyleValueSet>      maCellLineStyleValueSet;
     OUString                           maStr[CELL_LINE_STYLE_ENTRIES];
 
     /// bitfield
@@ -46,18 +46,20 @@ private:
 
 public:
     CellLineStyleControl(vcl::Window* pParent, CellAppearancePropertyPanel& rPanel);
+    virtual ~CellLineStyleControl();
+    virtual void dispose() SAL_OVERRIDE;
 
     void GetFocus() SAL_OVERRIDE;
     void SetLineStyleSelect(sal_uInt16 out, sal_uInt16 in, sal_uInt16 dis);
 
     ValueSet& GetValueSet()
     {
-        return maCellLineStyleValueSet;
+        return *maCellLineStyleValueSet.get();
     }
 
     Control& GetPushButton()
     {
-        return maPushButtonMoreOptions;
+        return *maPushButtonMoreOptions.get();
     }
 };
 
diff --git a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx
index eae59d67fa17..d928903d2041 100644
--- a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx
+++ b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx
@@ -34,7 +34,13 @@ CellLineStyleValueSet::CellLineStyleValueSet( vcl::Window* pParent, const ResId&
 
 CellLineStyleValueSet::~CellLineStyleValueSet()
 {
+    dispose();
+}
+
+void CellLineStyleValueSet::dispose()
+{
     delete pVDev;
+    ValueSet::dispose();
 }
 
 void CellLineStyleValueSet::SetUnit(const OUString* str)
diff --git a/sc/source/ui/sidebar/CellLineStyleValueSet.hxx b/sc/source/ui/sidebar/CellLineStyleValueSet.hxx
index 969f346005d4..65b390a4e4fa 100644
--- a/sc/source/ui/sidebar/CellLineStyleValueSet.hxx
+++ b/sc/source/ui/sidebar/CellLineStyleValueSet.hxx
@@ -35,6 +35,7 @@ private:
 public:
     CellLineStyleValueSet( vcl::Window* pParent, const ResId& rResId);
     virtual ~CellLineStyleValueSet();
+    virtual void dispose() SAL_OVERRIDE;
 
     void SetUnit(const OUString* str);
     void SetSelItem(sal_uInt16 nSel);