diff options
author | Jun Nogata <nogajun@gmail.com> | 2021-08-15 15:17:53 +0900 |
---|---|---|
committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-12-09 15:08:39 +0100 |
commit | bbe8db038a98d2c89fd86370495bd986951263cd (patch) | |
tree | a8900aff4387e242ac145da536960db1c7d2c0f0 /sw | |
parent | e6421938fbab713fff64aef6ff864f68882fb258 (diff) |
tdf#143422 Hide "Hyphenation data not found" in Japanese
When I open a document with mixed English and Japanese, I get a warning
"Missing hyphenation data Please install the hyphenation package for locale "ja"".
English needs hyphenation, but Japanese does not need hyphenation. However,
the hyphenation check only checks for unknown language or no language.
Change-Id: I559e1b1eec8089f50aadad2710a33d0268ab13f2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120497
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
(cherry picked from commit 53d5555f13371252874ec962dee4643168d26780)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126429
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 9b47fe4746c2fc32272533aaf7267ab9b3d2e749)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126523
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/text/inftxt.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 6dbfdc4d6e56..387080567e81 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -1486,7 +1486,8 @@ bool SwTextFormatInfo::IsHyphenate() const return false; LanguageType eTmp = GetFont()->GetLanguage(); - if( LANGUAGE_DONTKNOW == eTmp || LANGUAGE_NONE == eTmp ) + // TODO: check for more ideographic langs w/o hyphenation as a concept + if ( LANGUAGE_DONTKNOW == eTmp || LANGUAGE_NONE == eTmp || LANGUAGE_JAPANESE == eTmp ) return false; uno::Reference< XHyphenator > xHyph = ::GetHyphenator(); |