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

Pranam Lashkari (via logerrit) logerrit at kemper.freedesktop.org
Tue Mar 23 12:35:07 UTC 2021


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

New commits:
commit 6af0a488a059982a8b5d72fe399c7e8841a2e9b4
Author:     Pranam Lashkari <lpranam at collabora.com>
AuthorDate: Tue Mar 23 15:41:49 2021 +0530
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue Mar 23 13:34:31 2021 +0100

    Notebookbar: skip early init in all apps
    
    for more details 42cc32c95db2484961a65c906af1a899c1a6aa2b
    
    Change-Id: I64f1ce22f7e1cbdbab3aea17841030a6313c1c0f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112978
    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 e854a5e047d7..36346b22c21b 100644
--- a/sfx2/source/notebookbar/SfxNotebookBar.cxx
+++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx
@@ -377,8 +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() && eApp == vcl::EnumContext::Application::Writer
-                && bSkippedFirstInit.find(pViewShell) == bSkippedFirstInit.end())
+            if (comphelper::LibreOfficeKit::isActive() && bSkippedFirstInit.find(pViewShell) == bSkippedFirstInit.end())
             {
                 bSkippedFirstInit[pViewShell] = true;
                 return false;


More information about the Libreoffice-commits mailing list