1 files changed, 11 insertions, 0 deletions
diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.cxx b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
index 53fd3afaef70..d35ac67a880b 100644
--- a/sw/source/uibase/sidebar/PagePropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
@@ -221,6 +221,14 @@ void PagePropertyPanel::dispose()
     mpToolBoxMargin.clear();
     mpToolBoxSize.clear();
     mpToolBoxColumn.clear();
+
+    m_aSwPagePgULControl.dispose();
+    m_aSwPagePgLRControl.dispose();
+    m_aSwPagePgSizeControl.dispose();
+    m_aSwPagePgControl.dispose();
+    m_aSwPageColControl.dispose();
+    m_aSwPagePgMetricControl.dispose();
+
     PanelLayout::dispose();
 }
 
@@ -482,6 +490,9 @@ void PagePropertyPanel::NotifyItemUpdate(
 {
     (void)bIsEnabled;
 
+    if (IsDisposed())
+        return;
+
     switch( nSId )
     {
     case SID_ATTR_PAGE_COLUMN: