[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sfx2/source

[Libreoffice Gerrit user]

 sfx2/source/notebookbar/SfxNotebookBar.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit c8a449f45c6d8d5223a721af74ff5888efffd8d7
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Fri Dec 14 18:29:41 2018 +0100
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Sat Dec 15 23:40:52 2018 +0100

    tdf#122112 Hide the menu bar when the notebookbar is locked
    
    Only reproducible with GTK3 (maybe KDE5?).
    This way we ensure a uniformed behavior across vclplugins anyway
    
    Change-Id: I6edd6a426cb206d797b504ddcdcef999f79fa3c8
    Reviewed-on: https://gerrit.libreoffice.org/65189
    Tested-by: Jenkins
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    (cherry picked from commit 21b81b07b01e4482a80ced8dcdf48c480031c3c8)
    Reviewed-on: https://gerrit.libreoffice.org/65197

diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx b/sfx2/source/notebookbar/SfxNotebookBar.cxx
index 5dcaea7861d8..1ff5a8cc7d83 100644
--- a/sfx2/source/notebookbar/SfxNotebookBar.cxx
+++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx
@@ -188,11 +188,13 @@ void SfxNotebookBar::CloseMethod(SystemWindow* pSysWindow)
 void SfxNotebookBar::LockNotebookBar()
 {
     m_bHide = true;
+    m_bLock = true;
 }
 
 void SfxNotebookBar::UnlockNotebookBar()
 {
     m_bHide = false;
+    m_bLock = false;
 }
 
 bool SfxNotebookBar::IsActive()