1 files changed, 11 insertions, 4 deletions
diff --git a/sw/source/uibase/sidebar/PageColumnControl.cxx b/sw/source/uibase/sidebar/PageColumnControl.cxx
index a8aa1223d6d7..4bec55f89fc3 100644
--- a/sw/source/uibase/sidebar/PageColumnControl.cxx
+++ b/sw/source/uibase/sidebar/PageColumnControl.cxx
@@ -38,7 +38,7 @@ PageColumnControl::PageColumnControl(
     const bool bLandscape )
     : ::svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_COLUMN) )
     , mpColumnValueSet( new ::svx::sidebar::ValueSetWithTextControl( ::svx::sidebar::ValueSetWithTextControl::IMAGE_TEXT, this, SW_RES(VS_COLUMN) ) )
-    , maMoreButton( this, SW_RES(CB_COLUMN_MORE) )
+    , maMoreButton( VclPtr<PushButton>::Create( this, SW_RES(CB_COLUMN_MORE) ) )
     , mnColumnType( nColumnType )
     , mrPagePropPanel(rPanel)
 {
@@ -69,15 +69,22 @@ PageColumnControl::PageColumnControl(
     mpColumnValueSet->Format();
     mpColumnValueSet->StartSelection();
 
-    maMoreButton.SetClickHdl( LINK( this, PageColumnControl, MoreButtonClickHdl_Impl ) );
-    maMoreButton.GrabFocus();
+    maMoreButton->SetClickHdl( LINK( this, PageColumnControl, MoreButtonClickHdl_Impl ) );
+    maMoreButton->GrabFocus();
 
     FreeResource();
 }
 
 PageColumnControl::~PageColumnControl()
 {
-    delete mpColumnValueSet;
+    disposeOnce();
+}
+
+void PageColumnControl::dispose()
+{
+    mpColumnValueSet.disposeAndClear();
+    maMoreButton.disposeAndClear();
+    ::svx::sidebar::PopupControl::dispose();
 }
 
 IMPL_LINK(PageColumnControl, ImplColumnHdl, void *, pControl)