diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-04-15 21:56:23 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-15 21:58:43 +0100 |
| commit | d3d2453432a59fbba3a8f8c44260982bf67ec939 (patch) | |
| tree | fa966dc490ca2273620494bf995740e28a283e0a /sw/source/uibase/sidebar/PagePropertyPanel.cxx | |
| parent | 389d3e6f01264b8d94b0f40cd8faecc4c954a838 (diff) | |
Unregister sidebar ControllerItems at the right time.
Otherwise they linger post-dispose, wreaking havoc.
Change-Id: I6d0981ee15e82111bc825c75d28b703e5a5d266b
Diffstat (limited to 'sw/source/uibase/sidebar/PagePropertyPanel.cxx')
| -rw-r--r-- | sw/source/uibase/sidebar/PagePropertyPanel.cxx | 11 |
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: |