[Libreoffice-commits] core.git: sfx2/source
Szymon KÅos (via logerrit)
logerrit at kemper.freedesktop.org
Tue Nov 24 17:20:50 UTC 2020
sfx2/source/notebookbar/SfxNotebookBar.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d5552b8bb29c01cab4624f07dc2539a9673e7482
Author: Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Nov 3 11:59:09 2020 +0100
Commit: Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue Nov 24 18:20:00 2020 +0100
notebookbar: don't block init in calc
Change-Id: I7fdebcf317c8ebd3e322c1f73d9a4e7df30ecd27
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105240
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106420
Tested-by: Jenkins
diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx b/sfx2/source/notebookbar/SfxNotebookBar.cxx
index 39e60f61dfe9..cff228473371 100644
--- a/sfx2/source/notebookbar/SfxNotebookBar.cxx
+++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx
@@ -360,7 +360,7 @@ bool SfxNotebookBar::StateMethod(SystemWindow* pSysWindow,
// * in LOK: Paste Special feature was incorrectly initialized
// Skip first request so Notebookbar will be initialized after document was loaded
static std::map<const void*, bool> bSkippedFirstInit;
- if (comphelper::LibreOfficeKit::isActive()
+ if (comphelper::LibreOfficeKit::isActive() && eApp == vcl::EnumContext::Application::Writer
&& bSkippedFirstInit.find(pViewShell) == bSkippedFirstInit.end())
{
bSkippedFirstInit[pViewShell] = true;
More information about the Libreoffice-commits
mailing list