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

[Szymon KÅ‚os (via logerrit)]

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

New commits:
commit d711d4430e6c44ef362928f1c1d7179bc3db1471
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 3 13:19:04 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>

diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx b/sfx2/source/notebookbar/SfxNotebookBar.cxx
index a50db24cc07b..e854a5e047d7 100644
--- a/sfx2/source/notebookbar/SfxNotebookBar.cxx
+++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx
@@ -377,7 +377,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;