summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhaled Hosny <khaled@aliftype.com>2022-10-03 13:06:19 +0200
committerAndras Timar <andras.timar@collabora.com>2022-10-24 20:57:23 +0200
commit85d77da410eec9dffb813c2e11e1537b691d84a2 (patch)
treea06b177c6899e178e721481c6a2d69ef736e7cf8
parent919e710e44e654ad78c0635cc459e23636c0888c (diff)
tdf#126657, tdf#145104: Don’t set language to none on defined styles
Language is used for more things than spell checking (localized digits, accessibility, OpenType layout, and probably more). A better way is needed to disable spell checking for parts of the document by default while keeping the language alone, but right now I’m reverting these changes because they are workarounds for essentially cosmetic issues. This reverts the following commits: commit ca91beb9d983754a5cba9e3df1bf18295e6640a0 Author: Vladimir Glazounov <vg@openoffice.org> Date: Wed Jun 4 08:50:40 2008 +0000 INTEGRATION: CWS sw30bf04 (1.51.2); FILE MERGED 2008/05/13 07:20:17 fme 1.51.2.1: #i40133# rail: Set internet link style language to none to prevent spell checking commit 137a1d5380e310a43d36932c643e1331a94fd70d Author: Heiko Tietze <tietze.heiko@gmail.com> Date: Mon Jul 19 16:40:50 2021 +0200 Resolves tdf#143066 - Language set to None for indices Change-Id: Idc9455f3f04e661bd00a9829dd0f0916844dc8eb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140902 Tested-by: Jenkins Reviewed-by: خالد حسني <khaled@aliftype.com> (cherry picked from commit 2cca160f8bfc4597cf0ad3aaaf0017a5210ea0ec) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140958
-rw-r--r--sw/source/core/doc/DocumentStylePoolManager.cxx15
1 files changed, 0 insertions, 15 deletions
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx
index 1dc1885c8e98..4c9720e067bb 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -823,14 +823,6 @@ SwTextFormatColl* DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
aSet.Put( SvxWidowsItem( 0, RES_PARATR_WIDOWS ) );
aSet.Put( SvxOrphansItem( 0, RES_PARATR_ORPHANS ) );
}
- // tdf#143066 : set language to 'none' to prevent spell checking for indices
- if (nId == RES_POOLCOLL_REGISTER_BASE)
- {
- aSet.Put( SvxLanguageItem( LANGUAGE_NONE, RES_CHRATR_LANGUAGE ) );
- aSet.Put( SvxLanguageItem( LANGUAGE_NONE, RES_CHRATR_CJK_LANGUAGE ) );
- aSet.Put( SvxLanguageItem( LANGUAGE_NONE, RES_CHRATR_CTL_LANGUAGE ) );
- }
- break;
}
break;
@@ -1559,19 +1551,12 @@ SwFormat* DocumentStylePoolManager::GetFormatFromPool( sal_uInt16 nId )
{
aSet.Put( SvxColorItem( COL_BLUE, RES_CHRATR_COLOR ) );
aSet.Put( SvxUnderlineItem( LINESTYLE_SINGLE, RES_CHRATR_UNDERLINE ) );
- // i40133: patch submitted by rail: set language to 'none' to prevent spell checking:
- aSet.Put( SvxLanguageItem( LANGUAGE_NONE, RES_CHRATR_LANGUAGE ) );
- aSet.Put( SvxLanguageItem( LANGUAGE_NONE, RES_CHRATR_CJK_LANGUAGE ) );
- aSet.Put( SvxLanguageItem( LANGUAGE_NONE, RES_CHRATR_CTL_LANGUAGE ) );
}
break;
case RES_POOLCHR_INET_VISIT:
{
aSet.Put( SvxColorItem( COL_RED, RES_CHRATR_COLOR ) );
aSet.Put( SvxUnderlineItem( LINESTYLE_SINGLE, RES_CHRATR_UNDERLINE ) );
- aSet.Put( SvxLanguageItem( LANGUAGE_NONE, RES_CHRATR_LANGUAGE ) );
- aSet.Put( SvxLanguageItem( LANGUAGE_NONE, RES_CHRATR_CJK_LANGUAGE ) );
- aSet.Put( SvxLanguageItem( LANGUAGE_NONE, RES_CHRATR_CTL_LANGUAGE ) );
}
break;
case RES_POOLCHR_JUMPEDIT: