From 92b88e0cc7e3d432acc9ec5a894451018fbf7b95 Mon Sep 17 00:00:00 2001 From: Szymon Kłos Date: Mon, 12 Oct 2020 14:19:54 +0200 Subject: notebookbar: set language before creating MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I04243667b564670096d2c8db0352ab179e1b0151 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104212 Tested-by: Andras Timar Reviewed-by: Andras Timar Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105595 Tested-by: Jenkins Reviewed-by: Szymon Kłos --- sfx2/source/notebookbar/SfxNotebookBar.cxx | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'sfx2') diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx b/sfx2/source/notebookbar/SfxNotebookBar.cxx index 4c5ccbe8a063..39e60f61dfe9 100644 --- a/sfx2/source/notebookbar/SfxNotebookBar.cxx +++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx @@ -380,6 +380,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(); -- cgit