diff options
| author | Xisco Faulí <xiscofauli@libreoffice.org> | 2018-11-21 18:04:05 +0100 |
|---|---|---|
| committer | Xisco Faulí <xiscofauli@libreoffice.org> | 2018-11-21 23:39:12 +0100 |
| commit | 1c73f379bf8d6f75460790fec2993106e10f15a0 (patch) | |
| tree | 0a723c518fd3622f4f2b1c28cd0523a9f0714e5d /sfx2/source | |
| parent | b73450caef299d38350f446d914f45b7c23a25b7 (diff) | |
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/63737
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Diffstat (limited to 'sfx2/source')
| -rw-r--r-- | sfx2/source/appl/workwin.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index 3f6f3ca0a1e1..20ad05d51573 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -54,7 +54,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; @@ -1195,7 +1194,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( m_aTbxTypeName ); aTbxId += GetResourceURLFromToolbarId(eId); |