sfx2/source/appl/workwin.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 2c317751c4b7661c10bd9eb11094febeccd1b816
Author: Kshitij Pathania <kshitijpatha...@gmail.com>
Date: Sun Jun 24 01:57:11 2018 +0530
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.k...@collabora.com>
Tested-by: Szymon Kłos <szymon.k...@collabora.com>
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);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
