diff options
| author | Kshitij Pathania <kshitijpathania@gmail.com> | 2018-06-24 01:57:11 +0530 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2018-07-06 17:20:13 +0200 |
| commit | 6d1c9d49bd262ba6746f5d5d2dd4e73da72b2324 (patch) | |
| tree | f8519518f09ce13adb762f941bb9c1ac8b659023 /sfx2 | |
| parent | a09ed9a9eae17103b7ad6b5f99c78f6c36b6084b (diff) | |
tdf#103226 Notebookbar:Disabled appearence of context toolbars
Change-Id: Ib4a5a1f1904976e9f511d7a908393cb072bc3aea
Reviewed-on: https://gerrit.libreoffice.org/56341
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Tested-by: Szymon Kłos <szymon.klos@collabora.com>
(cherry picked from commit 2c317751c4b7661c10bd9eb11094febeccd1b816)
Reviewed-on: https://gerrit.libreoffice.org/57054
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 20ad05d51573..3f6f3ca0a1e1 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -54,6 +54,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; @@ -1194,7 +1195,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( m_aTbxTypeName ); aTbxId += GetResourceURLFromToolbarId(eId); |