[Libreoffice-commits] core.git: sfx2/source

[Szymon KÅ‚os (via logerrit)]

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

New commits:
commit 18387b547ffbab2d19ab4968ea8194f7aee07192
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Mon Jul 12 12:24:09 2021 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Sat Jul 17 17:33:11 2021 +0200

    Revert "Notebookbar: skip early init in all apps"
    
    This reverts commit 6af0a488a059982a8b5d72fe399c7e8841a2e9b4.
    
    Delayed notebookbar init in Calc causes "number format" combobox
    to not work. (it works after some number is typed into document only).
    Original problem fixed by reverted change doesn't exist anymore
    because new shortcuts for paste special and paste unformatted text were
    introduced
    
    Change-Id: Ie112ae0df7b6d3782916b98c96f1a17b15396115
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118771
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Pranam Lashkari <lpranam at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119101
    Tested-by: Jenkins
    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 fb90113f9f05..ce7c416a8c39 100644
--- a/sfx2/source/notebookbar/SfxNotebookBar.cxx
+++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx
@@ -353,7 +353,8 @@ 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() && bSkippedFirstInit.find(pViewShell) == bSkippedFirstInit.end())
+            if (comphelper::LibreOfficeKit::isActive() && eApp == vcl::EnumContext::Application::Writer
+                && bSkippedFirstInit.find(pViewShell) == bSkippedFirstInit.end())
             {
                 bSkippedFirstInit[pViewShell] = true;
                 return false;