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

[mert (via logerrit)]

 desktop/source/lib/init.cxx        |    1 +
 vcl/source/control/notebookbar.cxx |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit a3ac2bdfa475fa34172e08d1ec30114d4cd63da1
Author:     mert <mert.tumer at collabora.com>
AuthorDate: Thu Feb 25 11:41:24 2021 +0300
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Fri Feb 26 10:05:43 2021 +0100

    Init Notebookbar for Online Draw
    
    Change-Id: I85a25820d3968070dd8a05156b4bb4a1ebe59f99
    Signed-off-by: mert <mert.tumer at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111518
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 621e2f3455f8..8cd4503ed189 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -6404,6 +6404,7 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char
         activateNotebookbar("Writer");
         activateNotebookbar("Calc");
         activateNotebookbar("Impress");
+        activateNotebookbar("Draw");
     }
 
     return bInitialized;
diff --git a/vcl/source/control/notebookbar.cxx b/vcl/source/control/notebookbar.cxx
index 78e99e00c660..451c2c9a59f8 100644
--- a/vcl/source/control/notebookbar.cxx
+++ b/vcl/source/control/notebookbar.cxx
@@ -71,7 +71,8 @@ NotebookBar::NotebookBar(Window* pParent, const OString& rID, const OUString& rU
     bool bIsWelded = comphelper::LibreOfficeKit::isActive()
                     && (rUIXMLDescription == "modules/swriter/ui/notebookbar.ui"
                     || rUIXMLDescription == "modules/scalc/ui/notebookbar.ui"
-                    || rUIXMLDescription == "modules/simpress/ui/notebookbar.ui");
+                    || rUIXMLDescription == "modules/simpress/ui/notebookbar.ui"
+                    || rUIXMLDescription == "modules/sdraw/ui/notebookbar.ui");
     if (bIsWelded)
     {
         m_bIsWelded = true;