diff options
| author | Eike Rathke <erack@redhat.com> | 2018-03-07 20:02:26 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-03-19 10:21:42 +0100 |
| commit | 86bfe605dabf81a893b49f2c089c96816a188f82 (patch) | |
| tree | 4d1d12c8a63a4faa014aa035597fc4cce2a8187d /officecfg | |
| parent | f6926d2140cce74c30cf9b30fe58cd43a73399ec (diff) | |
Resolves: tdf#116242 handle negated diacritics correctly and show checkbox
This is a combination of 2 commits.
Resolves: tdf#116242 handle negated diacritics correctly and show checkbox
The "ignore diacritics" implementation is not only about CTL,
whatever its names suggest. It uses an ICU
"NFD; [:M:] Remove; NFC" transliteration that decomposes and
removes *any* diacritic.
Thus treat it as such and don't hide the checkbox if CTL is not
enabled, but more important preset the sensitive values, and
handle the UI vs implementation oddity correctly; UI "sensitive" /
code "include" means to *not* *ignore*, obtain the proper negated
value from the checkbox.
Unfortunately the setting is stored in the configuration, so an
update will still present the user with an unchecked
Diacritics-sensitive box s/he has to enable once.
The actual failure (diacritics always ignored) is a fallout from
commit d4064927a2e83c974d4ee9538081e8a4fcdb1e34
AuthorDate: Tue Oct 3 10:26:28 2017 -0800
CommitDate: Thu Oct 26 17:24:26 2017 +0200
tdf#111846 Find & Replace: Rename diacritics and kashida options
(cherry picked from commit d99ae18b68d3889c999b59485006f85f7faa201c)
Change IsIgnoreDiacritics_CTL default to false, tdf#116242 follow-up
And adapt description to reality.
(cherry picked from commit a8959a26e18237c458a853f2ca7524e875d4c1b6)
ab35b74f4cbe7dc91fd0570adcc634faba96b5de
Change-Id: I65f2a23b66370fdfe2d170c17c7736a3b4177192
Reviewed-on: https://gerrit.libreoffice.org/50914
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 31f3e18d52c0cc124cd7a789a8f1fbc7c2534701)
Diffstat (limited to 'officecfg')
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Common.xcs | 4 | ||||
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 6ec7ec487676..f9ea2cb3ae3a 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -5744,9 +5744,9 @@ <!-- OldLocation: --> <!-- UIHints: Edit/Find & Replace --> <info> - <desc>Specifies search with the use of CTL option.</desc> + <desc>Specifies search ignores diacritics, not only CTL though.</desc> </info> - <value>true</value> + <value>false</value> </prop> <prop oor:name="IsIgnoreKashida_CTL" oor:type="xs:boolean" oor:nillable="false"> <!-- OldPath: --> diff --git a/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs index 1edab99beaff..98a581786d32 100644 --- a/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs @@ -954,9 +954,9 @@ </prop> <prop oor:name="IsIgnoreDiacritics_CTL" oor:type="xs:boolean" oor:nillable="false"> <info> - <desc>Specifies search with the use of CTL option.</desc> + <desc>Specifies search ignores diacritics, not only CTL though.</desc> </info> - <value>true</value> + <value>false</value> </prop> <prop oor:name="IsIgnoreKashida_CTL" oor:type="xs:boolean" oor:nillable="false"> <info> |