commit 9a6169529eb687190531225bfe9fef850325ee9e
author Xisco Faulí <xiscofauli@libreoffice.org> Wed Nov 21 18:04:05 2018 +0100
committer Xisco Faulí <xiscofauli@libreoffice.org> Wed Nov 21 23:38:36 2018 +0100
tree 550830bead61610d8b083fb81c325eae8c3b2456
parent 6d250d56ed9b6755a3f8131be39fc0537c3d862c

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/63735
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>

sfx2/source/appl/workwin.cxx

diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index b7f6edd..5320d83 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 );