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

[Szymon KÅ‚os (via logerrit)]

 sfx2/source/notebookbar/SfxNotebookBar.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 68a4433598057e69c30263da94b3d3ca20a1481e
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Mon Oct 12 14:19:54 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Oct 13 22:50:58 2020 +0200

    notebookbar: set language before creating
    
    Change-Id: I04243667b564670096d2c8db0352ab179e1b0151
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104212
    Tested-by: Andras Timar <andras.timar at collabora.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx b/sfx2/source/notebookbar/SfxNotebookBar.cxx
index 10c60065641e..a50db24cc07b 100644
--- a/sfx2/source/notebookbar/SfxNotebookBar.cxx
+++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx
@@ -397,6 +397,13 @@ bool SfxNotebookBar::StateMethod(SystemWindow* pSysWindow,
             aNotebookBarAddonsItem.aImageValues = aImageValues;
 
             // setup if necessary
+            if (comphelper::LibreOfficeKit::isActive())
+            {
+                // update the current LOK language and locale for the dialog tunneling
+                comphelper::LibreOfficeKit::setLanguageTag(pViewShell->GetLOKLanguageTag());
+                comphelper::LibreOfficeKit::setLocale(pViewShell->GetLOKLocale());
+            }
+
             pSysWindow->SetNotebookBar(aBuf, xFrame, aNotebookBarAddonsItem , bReloadNotebookbar);
             pNotebookBar = pSysWindow->GetNotebookBar();
             pNotebookBar->Show();