[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, 2 insertions(+), 1 deletion(-)

New commits:
commit ecc4ed4086ba37eb1b9649ef9a15427cf6df361f
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Mon Jul 12 12:24:09 2021 +0200
Commit:     Pranam Lashkari <lpranam at collabora.com>
CommitDate: Fri Jul 16 11:57:46 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>

diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx b/sfx2/source/notebookbar/SfxNotebookBar.cxx
index 0fdb739cd3f0..cc06c280f71a 100644
--- a/sfx2/source/notebookbar/SfxNotebookBar.cxx
+++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx
@@ -382,7 +382,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;