[Libreoffice-commits] core.git: sfx2/source

[Libreoffice Gerrit user]

 sfx2/source/appl/workwin.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f3ea5e21bea80004b04edbf0287d4a2e1aaef5d0
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Thu Nov 29 21:18:57 2018 +0100
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Fri Nov 30 08:10:57 2018 +0100

    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 at collabora.com>

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 );