commit 2c317751c4b7661c10bd9eb11094febeccd1b816
author Kshitij Pathania <kshitijpathania@gmail.com> Sun Jun 24 01:57:11 2018 +0530
committer Szymon Kłos <szymon.klos@collabora.com> Sun Jun 24 20:19:56 2018 +0200
tree 017a52106ac34573896d8a9a45d760cd60fb04ab
parent a7af4bbbc0793fb78aea6a89f8fb6dc052710a11

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>

sfx2/source/appl/workwin.cxx

diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 20ad05d..3f6f3ca 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);