sfx2/source/view/lokhelper.cxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
New commits: commit 1df99bcd3556162e33acc6300b7ca4b8b4c9c057 Author: Aron Budea <[email protected]> AuthorDate: Thu Jan 11 10:13:42 2024 +1030 Commit: Aron Budea <[email protected]> CommitDate: Thu Jan 11 01:44:54 2024 +0100 Revert "lok: Log actual differing language" A change that fixes the same issue got merged recently. This reverts commit 9c35edb44a82a346122e9ba762165161d1ebcf02. Change-Id: Ib2565e41b31b7e53e423aba2bdf60d4dbb9f0da5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161901 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Aron Budea <[email protected]> diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx index 0eb4a31607ac..c54551b1637f 100644 --- a/sfx2/source/view/lokhelper.cxx +++ b/sfx2/source/view/lokhelper.cxx @@ -192,8 +192,7 @@ void SfxLokHelper::setView(int nId) DisableCallbacks dc; bool bIsCurrShell = (pViewShell == SfxViewShell::Current()); - const auto aKitLang = comphelper::LibreOfficeKit::getLanguageTag().getBcp47(); - if (bIsCurrShell && aKitLang == pViewShell->GetLOKLanguageTag().getBcp47()) + if (bIsCurrShell && comphelper::LibreOfficeKit::getLanguageTag().getBcp47() == pViewShell->GetLOKLanguageTag().getBcp47()) return; if (bIsCurrShell) @@ -202,7 +201,7 @@ void SfxLokHelper::setView(int nId) // But it looks like that the language can go wrong, so we have to fix that. // This can happen, when someone sets the language or SfxViewShell::Current() separately. SAL_WARN("lok", "LANGUAGE mismatch at setView! ... old (wrong) lang:" - << aKitLang + << comphelper::LibreOfficeKit::getLanguageTag().getBcp47() << " new lang:" << pViewShell->GetLOKLanguageTag().getBcp47()); }
