sfx2/source/view/viewsh.cxx | 4 ++-- vcl/jsdialog/enabled.cxx | 1 + 2 files changed, 3 insertions(+), 2 deletions(-)
New commits: commit 62826a4c54c67d4925aa5a79e5ecaf3b07ffefdd Author: Andras Timar <[email protected]> AuthorDate: Wed Jul 3 18:47:35 2024 +0200 Commit: Andras Timar <[email protected]> CommitDate: Sat Aug 24 06:56:17 2024 +0200 jsdialog: enable name dialog to test: 1. Help - Accessibility Check 2. If document title is not set, press [Fix] Change-Id: I9694679874c58515856edf8e3d31600258b8319c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169943 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Andras Timar <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172333 Tested-by: Jenkins diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index cc5eae96e86d..4b8b2f5b420a 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -55,6 +55,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/linestyletabpage.ui" || rUIFile == u"cui/ui/linetabpage.ui" || rUIFile == u"cui/ui/macroselectordialog.ui" + || rUIFile == u"cui/ui/namedialog.ui" || rUIFile == u"cui/ui/numberingformatpage.ui" || rUIFile == u"cui/ui/numberingoptionspage.ui" || rUIFile == u"cui/ui/numberingpositionpage.ui" commit 3968d46e20dc56c7470436c2332c79ee5aa694dc Author: Andras Timar <[email protected]> AuthorDate: Mon Jun 24 01:23:22 2024 +0200 Commit: Andras Timar <[email protected]> CommitDate: Sat Aug 24 06:56:03 2024 +0200 LOK: fix UI language fallback, e.g. zh-HK -> zh-TW The original author wanted to handle de-CH as special case, but he wrote a general condition. - comphelper::LibreOfficeKit::isActive() is redundant, because we call SfxViewShell::SetLOKLanguageTag() from LOK. - AFAIK there are no other, similar cases. We know about only de-CH, so let's make it explicit in the condition. - This fixes UI language setting when the integration asks for zh-HK. Previously it falsely fell back to en-US here, instead of zh-TW. Change-Id: Ie42e09b8e202b654b109ab8d777ab36a5ef56dca Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169363 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172332 Tested-by: Jenkins Reviewed-by: Andras Timar <[email protected]> diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 0bbc5a2926ea..0676ef9e98e0 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -3352,8 +3352,8 @@ void SfxViewShell::SetLOKLanguageTag(const OUString& rBcp47LanguageTag) LanguageTag aFallbackTag = LanguageTag(getInstalledLocaleForSystemUILanguage(inst, /* bRequestInstallIfMissing */ false, rBcp47LanguageTag), true).makeFallback(); // If we want de-CH, and the de localisation is available, we don't want to use de-DE as then - // the magic in Translate::get() won't turn ess-zet into double s. Possibly other similar cases? - if (comphelper::LibreOfficeKit::isActive() && aTag.getLanguage() == aFallbackTag.getLanguage()) + // the magic in Translate::get() won't turn ess-zet into double s. + if (rBcp47LanguageTag == "de-CH") maLOKLanguageTag = std::move(aTag); else maLOKLanguageTag = std::move(aFallbackTag);
