summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2018-12-07 13:10:57 +0300
committerAndras Timar <andras.timar@collabora.com>2018-12-16 11:02:36 +0100
commitbab0fc531cf063880c27b7d7081d4acbd40b649a (patch)
tree69ddcc2386a442a4aef5501cbff36b56a1096ec7 /editeng
parentbd5f75d44a55c0608dc328ca74b19302955bf67f (diff)
tdf#121779: extend TWo CApitals list to also ignore sMALL iNITIALS
Now this list is used also in rules for capitalizing first letter of every sentence, and for correcting accidental use of Caps Lock key. Change-Id: I4fbdbccbae32743d5e9a6757344361eefd88e167 Reviewed-on: https://gerrit.libreoffice.org/64759 Tested-by: Jenkins Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com> Reviewed-by: Sophie Gautier <gautier.sophie@gmail.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/65087 Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/misc/svxacorr.cxx8
1 files changed, 8 insertions, 0 deletions
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 9c8eeb9d2dac..bf52a5cf2a69 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -902,6 +902,10 @@ bool SvxAutoCorrect::FnCapitalStartSentence( SvxAutoCorrDoc& rDoc,
return false; // no valid separator -> no replacement
}
+ // No replacement for words in TWo INitial CApitals or sMALL iNITIAL list
+ if (FindInWrdSttExceptList(eLang, OUString(pWordStt, pDelim - pWordStt)))
+ return false;
+
if( bAtStart ) // at the beginning of a paragraph?
{
// Check out the previous paragraph, if it exists.
@@ -1119,6 +1123,10 @@ bool SvxAutoCorrect::FnCorrectCapsLock( SvxAutoCorrDoc& rDoc, const OUString& rT
aConverted += rCC.uppercase(OUString(rTxt[nSttPos]));
aConverted += rCC.lowercase(OUString(rTxt[nSttPos+1]));
+ // No replacement for words in TWo INitial CApitals or sMALL iNITIAL list
+ if (FindInWrdSttExceptList(eLang, rTxt.copy(nSttPos, nEndPos - nSttPos)))
+ return false;
+
for( sal_Int32 i = nSttPos+2; i < nEndPos; ++i )
{
if ( IsLowerLetter(rCC.getCharacterType(rTxt, i)) )