Kaydet (Commit) 2c317751 authored tarafından Kshitij Pathania's avatar Kshitij Pathania Kaydeden (comit) Szymon Kłos

Notebookbar:Disabled appearence of context toolbars

Change-Id: Ib4a5a1f1904976e9f511d7a908393cb072bc3aea
Reviewed-on: https://gerrit.libreoffice.org/56341
Tested-by: Jenkins
Reviewed-by: 's avatarSzymon Kłos <szymon.klos@collabora.com>
Tested-by: 's avatarSzymon Kłos <szymon.klos@collabora.com>
üst a7af4bbb
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
#include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/DisposedException.hpp>
#include <type_traits> #include <type_traits>
#include <unordered_map> #include <unordered_map>
#include <sfx2/notebookbar/SfxNotebookBar.hxx>
using namespace ::com::sun::star; using namespace ::com::sun::star;
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
...@@ -1194,7 +1195,7 @@ void SfxWorkWindow::UpdateObjectBars_Impl2() ...@@ -1194,7 +1195,7 @@ void SfxWorkWindow::UpdateObjectBars_Impl2()
// Is a ToolBox required in this context ? // Is a ToolBox required in this context ?
bool bModesMatching = (nUpdateMode != SfxVisibilityFlags::Invisible) && ((nTbxMode & nUpdateMode) == nUpdateMode); bool bModesMatching = (nUpdateMode != SfxVisibilityFlags::Invisible) && ((nTbxMode & nUpdateMode) == nUpdateMode);
if ( bDestroy ) if ( bDestroy || sfx2::SfxNotebookBar::IsActive())
{ {
OUString aTbxId( m_aTbxTypeName ); OUString aTbxId( m_aTbxTypeName );
aTbxId += GetResourceURLFromToolbarId(eId); aTbxId += GetResourceURLFromToolbarId(eId);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment