diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-29 21:18:57 +0100 |
|---|---|---|
| committer | Xisco Faulí <xiscofauli@libreoffice.org> | 2018-12-02 14:34:16 +0100 |
| commit | 53170cae2057f705e779ec4b8538d422d071986e (patch) | |
| tree | e72cfd420cc6a9345b54340bfe568fea7a455a35 /sfx2 | |
| parent | 9ce21daf20faae0e5c8dd8eeb0909106e23a4319 (diff) | |
Revert "Revert "Notebookbar:Disabled appearence of context toolbars""
This reverts commit 9a6169529eb687190531225bfe9fef850325ee9e now
that proper fix for both tdf#121591 and tdf#119945 is pushed -
see commit 0a36be3fee1b4f1b47b55a64668b6aa99896ab24.
Change-Id: Ia44510d427e0626a5f566210247db8848653f8e2
Reviewed-on: https://gerrit.libreoffice.org/64279
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit f3ea5e21bea80004b04edbf0287d4a2e1aaef5d0)
Reviewed-on: https://gerrit.libreoffice.org/64316
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/workwin.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index 5320d832b13a..b7f6eddd9777 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -55,6 +55,7 @@ #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; @@ -1203,7 +1204,7 @@ void SfxWorkWindow::UpdateObjectBars_Impl2() // Is a ToolBox required in this context ? bool bModesMatching = (nUpdateMode != SfxVisibilityFlags::Invisible) && ((nTbxMode & nUpdateMode) == nUpdateMode); - if ( bDestroy ) + if ( bDestroy || sfx2::SfxNotebookBar::IsActive()) { OUString aTbxId = g_aTbxTypeName + GetResourceURLFromToolbarId(eId); xLayoutManager->destroyElement( aTbxId ); |