sfx2/source/appl/workwin.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
New commits: commit db9f978e4a2aa38c52ed42681dc2eff3e9849fa9 Author: Xisco Faulí <xiscofa...@libreoffice.org> AuthorDate: Wed Nov 21 18:04:05 2018 +0100 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Wed Nov 21 22:27:31 2018 +0100 Revert "Notebookbar:Disabled appearence of context toolbars" This reverts commit 2c317751c4b7661c10bd9eb11094febeccd1b816. So far, two crashes has been found related to this commit: tdf#121591 and tdf#119945 which can be reproduced with or without the notebook enabled. Besides, the author seems no to be inactive now... Change-Id: Ie1ff88afc59abea176f6ae9d459a835aef39c57a Reviewed-on: https://gerrit.libreoffice.org/63736 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index b7f6eddd9777..5320d832b13a 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -55,7 +55,6 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <type_traits> #include <unordered_map> -#include <sfx2/notebookbar/SfxNotebookBar.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -1204,7 +1203,7 @@ void SfxWorkWindow::UpdateObjectBars_Impl2() // Is a ToolBox required in this context ? bool bModesMatching = (nUpdateMode != SfxVisibilityFlags::Invisible) && ((nTbxMode & nUpdateMode) == nUpdateMode); - if ( bDestroy || sfx2::SfxNotebookBar::IsActive()) + if ( bDestroy ) { OUString aTbxId = g_aTbxTypeName + GetResourceURLFromToolbarId(eId); xLayoutManager->destroyElement( aTbxId ); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits