|
 |
69cc7b |
From fce38cb5608fd35bc27f35c81cb27075ea85f9d3 Mon Sep 17 00:00:00 2001
|
|
|
69cc7b |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
69cc7b |
Date: Mon, 19 Jun 2017 14:07:46 +0100
|
|
|
69cc7b |
Subject: [PATCH 1/2] rename IsAutoCapitalizeWordDelim to NonFieldWordDelim
|
|
|
69cc7b |
|
|
|
69cc7b |
Change-Id: If8fb8f5e51bba8e631a6fc5db54487b418c19e05
|
|
|
69cc7b |
---
|
|
|
69cc7b |
editeng/source/misc/svxacorr.cxx | 22 +++++++++++-----------
|
|
|
69cc7b |
1 file changed, 11 insertions(+), 11 deletions(-)
|
|
|
69cc7b |
|
|
|
69cc7b |
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
|
|
|
69cc7b |
index f9f701b..6a815bc 100644
|
|
|
69cc7b |
--- a/editeng/source/misc/svxacorr.cxx
|
|
|
69cc7b |
+++ b/editeng/source/misc/svxacorr.cxx
|
|
|
69cc7b |
@@ -98,18 +98,18 @@ static const sal_Char
|
|
|
69cc7b |
|
|
|
69cc7b |
OUString EncryptBlockName_Imp(const OUString& rName);
|
|
|
69cc7b |
|
|
|
69cc7b |
-static inline bool IsWordDelim( const sal_Unicode c )
|
|
|
69cc7b |
+static inline bool NonFieldWordDelim( const sal_Unicode c )
|
|
|
69cc7b |
{
|
|
|
69cc7b |
return ' ' == c || '\t' == c || 0x0a == c ||
|
|
|
69cc7b |
- cNonBreakingSpace == c || 0x2011 == c || 0x1 == c;
|
|
|
69cc7b |
+ cNonBreakingSpace == c || 0x2011 == c;
|
|
|
69cc7b |
}
|
|
|
69cc7b |
|
|
|
69cc7b |
-static inline bool IsAutoCapitalizeWordDelim( const sal_Unicode c )
|
|
|
69cc7b |
+static inline bool IsWordDelim( const sal_Unicode c )
|
|
|
69cc7b |
{
|
|
|
69cc7b |
- return ' ' == c || '\t' == c || 0x0a == c ||
|
|
|
69cc7b |
- cNonBreakingSpace == c || 0x2011 == c;
|
|
|
69cc7b |
+ return c == 0x1 || NonFieldWordDelim(c);
|
|
|
69cc7b |
}
|
|
|
69cc7b |
|
|
|
69cc7b |
+
|
|
|
69cc7b |
static inline bool IsLowerLetter( sal_Int32 nCharType )
|
|
|
69cc7b |
{
|
|
|
69cc7b |
return CharClass::isLetterType( nCharType ) &&
|
|
|
69cc7b |
@@ -870,9 +870,9 @@ bool SvxAutoCorrect::FnCapitalStartSentence( SvxAutoCorrDoc& rDoc,
|
|
|
69cc7b |
|
|
|
69cc7b |
if( !bAtStart ) // Still no beginning of a paragraph?
|
|
|
69cc7b |
{
|
|
|
69cc7b |
- if (IsAutoCapitalizeWordDelim(*pStr))
|
|
|
69cc7b |
+ if (NonFieldWordDelim(*pStr))
|
|
|
69cc7b |
{
|
|
|
69cc7b |
- while (!(bAtStart = (pStart == pStr--)) && IsAutoCapitalizeWordDelim(*pStr))
|
|
|
69cc7b |
+ while (!(bAtStart = (pStart == pStr--)) && NonFieldWordDelim(*pStr))
|
|
|
69cc7b |
;
|
|
|
69cc7b |
}
|
|
|
69cc7b |
// Asian full stop, full width full stop, full width exclamation mark
|
|
|
69cc7b |
@@ -903,7 +903,7 @@ bool SvxAutoCorrect::FnCapitalStartSentence( SvxAutoCorrDoc& rDoc,
|
|
|
69cc7b |
|
|
|
69cc7b |
do { // overwrite all blanks
|
|
|
69cc7b |
--pStr;
|
|
|
69cc7b |
- if (!IsAutoCapitalizeWordDelim(*pStr))
|
|
|
69cc7b |
+ if (!NonFieldWordDelim(*pStr))
|
|
|
69cc7b |
break;
|
|
|
69cc7b |
} while( ! ( bAtStart = (pStart == pStr) ) );
|
|
|
69cc7b |
|
|
|
69cc7b |
@@ -998,7 +998,7 @@ bool SvxAutoCorrect::FnCapitalStartSentence( SvxAutoCorrDoc& rDoc,
|
|
|
69cc7b |
else
|
|
|
69cc7b |
bAlphaFnd = true;
|
|
|
69cc7b |
}
|
|
|
69cc7b |
- else if (bAlphaFnd || IsAutoCapitalizeWordDelim(*pTmpStr))
|
|
|
69cc7b |
+ else if (bAlphaFnd || NonFieldWordDelim(*pTmpStr))
|
|
|
69cc7b |
break;
|
|
|
69cc7b |
|
|
|
69cc7b |
if( pTmpStr == pStart )
|
|
|
69cc7b |
@@ -1014,7 +1014,7 @@ bool SvxAutoCorrect::FnCapitalStartSentence( SvxAutoCorrDoc& rDoc,
|
|
|
69cc7b |
bool bNumericOnly = '0' <= *(pStr+1) && *(pStr+1) <= '9';
|
|
|
69cc7b |
|
|
|
69cc7b |
// Search for the beginning of the word
|
|
|
69cc7b |
- while (!IsAutoCapitalizeWordDelim(*pStr))
|
|
|
69cc7b |
+ while (!NonFieldWordDelim(*pStr))
|
|
|
69cc7b |
{
|
|
|
69cc7b |
if( bNumericOnly && rCC.isLetter( aText, pStr - pStart ) )
|
|
|
69cc7b |
bNumericOnly = false;
|
|
|
69cc7b |
@@ -1028,7 +1028,7 @@ bool SvxAutoCorrect::FnCapitalStartSentence( SvxAutoCorrDoc& rDoc,
|
|
|
69cc7b |
if( bNumericOnly ) // consists of only numbers, then not
|
|
|
69cc7b |
return false;
|
|
|
69cc7b |
|
|
|
69cc7b |
- if (IsAutoCapitalizeWordDelim(*pStr))
|
|
|
69cc7b |
+ if (NonFieldWordDelim(*pStr))
|
|
|
69cc7b |
++pStr;
|
|
|
69cc7b |
|
|
|
69cc7b |
OUString sWord;
|
|
|
69cc7b |
--
|
|
|
69cc7b |
2.9.3
|
|
|
69cc7b |
|