From a456034cb2472ebb98217be223b73f5653c9e560 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 29 May 2015 20:18:49 +0100 Subject: VclPtr: tdf#91396 crash after tool options and sidebar switching MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I86c23ffc08c8dec275608d9bc0bbe5eaf7ce0993 Reviewed-on: https://gerrit.libreoffice.org/15985 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- sw/source/uibase/utlui/content.cxx | 1 + sw/source/uibase/utlui/navipi.cxx | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index f79b378abc98..d0c72c307a73 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -845,6 +845,7 @@ void SwContentTree::dispose() Clear(); // If applicable erase content types previously. bIsInDrag = false; aUpdTimer.Stop(); + SetActiveShell(0); SvTreeListBox::dispose(); } diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index 5c68de1433c5..051081b5210c 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -867,13 +867,13 @@ void SwNavigationPI::dispose() if ( IsBound() ) rBindings.Release(*this); - pPopupWindow.disposeAndClear(); pFloatingWindow.disposeAndClear(); - aContentToolBox.disposeAndClear(); - aGlobalToolBox.disposeAndClear(); - aContentTree.disposeAndClear(); - aGlobalTree.disposeAndClear(); + pPopupWindow.disposeAndClear(); aDocListBox.disposeAndClear(); + aGlobalTree.disposeAndClear(); + aContentTree.disposeAndClear(); + aGlobalToolBox.disposeAndClear(); + aContentToolBox.disposeAndClear(); aPageChgIdle.Stop(); -- cgit o/cib/libreoffice-6-2'>distro/cib/libreoffice-6-2 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/sd/uiconfig/sdraw/toolbar/masterviewtoolbar.xml
AgeCommit message (Collapse)Author
2018-05-23toolbar:id is not valid attribute of toolbar:toolbarChristian Lohmaier
according to framework/dtd/toolbar.dtd – and having the same ID everywhere also is kinda pointless.. Change-Id: Ia7768be2f951886e39e24d78fc6d69b4f3c84235 Reviewed-on: https://gerrit.libreoffice.org/54665 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>