Kaydet (Commit) 9a616952 authored tarafından Xisco Faulí's avatar Xisco Faulí

Revert "Notebookbar:Disabled appearence of context toolbars"

This reverts commit 2c317751.

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/63735Reviewed-by: 's avatarXisco Faulí <xiscofauli@libreoffice.org>
Tested-by: 's avatarXisco Faulí <xiscofauli@libreoffice.org>
üst 6d250d56
......@@ -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 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment