[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sfx2/source

[Szymon KÅ‚os (via logerrit)]

 sfx2/source/notebookbar/SfxNotebookBar.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 7e02d0e4f22aa362184a5ac634eb916383f3f3d5
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Fri Jul 31 12:19:34 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Fri Jul 31 12:53:49 2020 +0200

    notebookbar: early init on desktop
    
    prevent from showing menubar before notebookbar
    
    Change-Id: I3ad7d24e8d8fa342872d49b24e6636d15457b598
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99861
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx b/sfx2/source/notebookbar/SfxNotebookBar.cxx
index 5bd8e03f698b..e15f18cc5764 100644
--- a/sfx2/source/notebookbar/SfxNotebookBar.cxx
+++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx
@@ -371,11 +371,10 @@ bool SfxNotebookBar::StateMethod(SystemWindow* pSysWindow,
             || bReloadNotebookbar || comphelper::LibreOfficeKit::isActive())
         {
             // Notebookbar was loaded too early what caused:
-            //   * little hang in the start center on desktop
             //   * in LOK: Paste Special feature was incorrectly initialized
             // Skip first request so Notebookbar will be initialized after document was loaded
             static bool bSkipFirstInit = true;
-            if (bSkipFirstInit)
+            if (comphelper::LibreOfficeKit::isActive() && bSkipFirstInit)
             {
                 bSkipFirstInit = false;
                 return false;