diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2020-07-31 12:19:34 +0200 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2020-07-31 20:14:24 +0200 |
| commit | 59a1a711902d29a92c2babad28d8577bb03dd91b (patch) | |
| tree | 074dfc7bcbfefa24a950f0698eccffdb72ff50c5 /sfx2 | |
| parent | e21042b43ff3fe93440c543b91a052b5a00d3515 (diff) | |
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@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
(cherry picked from commit 7e02d0e4f22aa362184a5ac634eb916383f3f3d5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99843
Tested-by: Jenkins
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/notebookbar/SfxNotebookBar.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx b/sfx2/source/notebookbar/SfxNotebookBar.cxx index 41d6522c5456..dd79e65fa3ec 100644 --- a/sfx2/source/notebookbar/SfxNotebookBar.cxx +++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx @@ -367,11 +367,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; |