summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2015-05-26 09:49:42 +0200
committerJan Holesovsky <kendy@collabora.com>2015-05-26 12:20:26 +0200
commit42f0f1397ad6c36410e26f8bbc04372a754b153d (patch)
treefdf7493fb4999e04990902e8029c513f020aa081 /editeng
parent2cc3adf3a5fa277a6b578bd3cc1cab0d01c897eb (diff)
Global CptlSttSntnc -> CapitalStartSentence
Change-Id: Id428332201f14b172af1590baed6aa2a67e0557a
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/editeng/impedit2.cxx6
-rw-r--r--editeng/source/misc/acorrcfg.cxx4
-rw-r--r--editeng/source/misc/svxacorr.cxx26
3 files changed, 18 insertions, 18 deletions
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 79058932479d..f9d413189e1f 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -2490,7 +2490,7 @@ EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, sal_Unicode c,
// #i78661 allow application to turn off capitalization of
// start sentence explicitly.
// (This is done by setting IsFirstWordCapitalization to sal_False.)
- bool bOldCptlSttSntnc = pAutoCorrect->IsAutoCorrFlag( CptlSttSntnc );
+ bool bOldCapitalStartSentence = pAutoCorrect->IsAutoCorrFlag( CapitalStartSentence );
if (!IsFirstWordCapitalization())
{
ESelection aESel( CreateESel(aSel) );
@@ -2521,7 +2521,7 @@ EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, sal_Unicode c,
aSel.Max().GetIndex() <= aSecondWordSel.Min().GetIndex();
if (bIsFirstWordInFirstPara)
- pAutoCorrect->SetAutoCorrFlag( CptlSttSntnc, IsFirstWordCapitalization() );
+ pAutoCorrect->SetAutoCorrFlag( CapitalStartSentence, IsFirstWordCapitalization() );
}
ContentNode* pNode = aSel.Max().GetNode();
@@ -2535,7 +2535,7 @@ EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, sal_Unicode c,
// #i78661 since the SvxAutoCorrect object used here is
// shared we need to reset the value to it's original state.
- pAutoCorrect->SetAutoCorrFlag( CptlSttSntnc, bOldCptlSttSntnc );
+ pAutoCorrect->SetAutoCorrFlag( CapitalStartSentence, bOldCapitalStartSentence );
}
return aSel.Max();
}
diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx
index 31e4fecd80c2..fc746e15fde4 100644
--- a/editeng/source/misc/acorrcfg.cxx
+++ b/editeng/source/misc/acorrcfg.cxx
@@ -158,7 +158,7 @@ void SvxBaseAutoCorrCfg::Load(bool bInit)
break;//"TwoCapitalsAtStart",
case 4:
if(*static_cast<sal_Bool const *>(pValues[nProp].getValue()))
- nFlags |= CptlSttSntnc;
+ nFlags |= CapitalStartSentence;
break;//"CapitalAtStartSentence",
case 5:
if(*static_cast<sal_Bool const *>(pValues[nProp].getValue()))
@@ -267,7 +267,7 @@ void SvxBaseAutoCorrCfg::ImplCommit()
pValues[nProp].setValue(&bVal, rType);
break;//"TwoCapitalsAtStart",
case 4:
- bVal = 0 != (nFlags & CptlSttSntnc);
+ bVal = 0 != (nFlags & CapitalStartSentence);
pValues[nProp].setValue(&bVal, rType);
break;//"CapitalAtStartSentence",
case 5:
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 77816d9233eb..425e68762a3f 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -90,7 +90,7 @@ static const sal_Char
/* also at these ends - Brackets and all kinds of begin characters */
sImplEndSkipChars[] = "\"\')]}\x83\x84\x89\x91\x92\x93\x94";
-// These characters are allowed in words: (for FnCptlSttSntnc)
+// These characters are allowed in words: (for FnCapitalStartSentence)
static const sal_Char sImplWordChars[] = "-'";
OUString EncryptBlockName_Imp(const OUString& rName);
@@ -175,7 +175,7 @@ SvxAutoCorrDoc::~SvxAutoCorrDoc()
// Called by the functions:
// - FnCptlSttWrd
-// - FnCptlSttSntnc
+// - FnCapitalStartSentence
// after the exchange of characters. Then the words, if necessary, can be inserted
// into the exception list.
void SvxAutoCorrDoc::SaveCpltSttWord( sal_uLong, sal_Int32, const OUString&,
@@ -250,7 +250,7 @@ bool SvxAutoCorrect::NeedsHardspaceAutocorr( sal_Unicode cChar )
long SvxAutoCorrect::GetDefaultFlags()
{
long nRet = Autocorrect
- | CptlSttSntnc
+ | CapitalStartSentence
| CptlSttWrd
| ChgOrdinalNumber
| ChgToEnEmDash
@@ -340,7 +340,7 @@ void SvxAutoCorrect::SetAutoCorrFlag( long nFlag, bool bOn )
if( !bOn )
{
- if( (nOld & CptlSttSntnc) != (nFlags & CptlSttSntnc) )
+ if( (nOld & CapitalStartSentence) != (nFlags & CapitalStartSentence) )
nFlags &= ~CplSttLstLoad;
if( (nOld & CptlSttWrd) != (nFlags & CptlSttWrd) )
nFlags &= ~WrdSttLstLoad;
@@ -800,7 +800,7 @@ bool SvxAutoCorrect::FnChgWeightUnderl( SvxAutoCorrDoc& rDoc, const OUString& rT
}
-bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
+bool SvxAutoCorrect::FnCapitalStartSentence( SvxAutoCorrDoc& rDoc,
const OUString& rTxt, bool bNormalPos,
sal_Int32 nSttPos, sal_Int32 nEndPos,
LanguageType eLang )
@@ -1069,7 +1069,7 @@ bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
// Parahaps someone wants to have the word
if( bRet && SaveWordCplSttLst & nFlags )
- rDoc.SaveCpltSttWord( CptlSttSntnc, nSttPos, sWord, cSave );
+ rDoc.SaveCpltSttWord( CapitalStartSentence, nSttPos, sWord, cSave );
return bRet;
}
@@ -1335,7 +1335,7 @@ SvxAutoCorrect::DoAutoCorrect( SvxAutoCorrDoc& rDoc, const OUString& rTxt,
if( IsAutoCorrFlag( Autocorrect ) )
{
OUString aPara;
- OUString* pPara = IsAutoCorrFlag(CptlSttSntnc) ? &aPara : 0;
+ OUString* pPara = IsAutoCorrFlag(CapitalStartSentence) ? &aPara : 0;
// since LibO 4.1, '-' is a word separator
// fdo#67742 avoid "--" to be replaced by "–" if next is "-"
@@ -1375,10 +1375,10 @@ SvxAutoCorrect::DoAutoCorrect( SvxAutoCorrDoc& rDoc, const OUString& rTxt,
++nEnd;
// Capital letter at beginning of paragraph?
- if( IsAutoCorrFlag( CptlSttSntnc ) &&
- FnCptlSttSntnc( rDoc, aPara, false,
+ if( IsAutoCorrFlag( CapitalStartSentence ) &&
+ FnCapitalStartSentence( rDoc, aPara, false,
nCapLttrPos, nEnd, eLang ) )
- nRet |= CptlSttSntnc;
+ nRet |= CapitalStartSentence;
if( IsAutoCorrFlag( ChgToEnEmDash ) &&
FnChgToEnEmDash( rDoc, rTxt, nCapLttrPos, nEnd, eLang ) )
@@ -1414,9 +1414,9 @@ SvxAutoCorrect::DoAutoCorrect( SvxAutoCorrDoc& rDoc, const OUString& rTxt,
// Capital letter at beginning of paragraph ?
if( !bUnsupported &&
- IsAutoCorrFlag( CptlSttSntnc ) &&
- FnCptlSttSntnc( rDoc, rTxt, true, nCapLttrPos, nInsPos, eLang ) )
- nRet |= CptlSttSntnc;
+ IsAutoCorrFlag( CapitalStartSentence ) &&
+ FnCapitalStartSentence( rDoc, rTxt, true, nCapLttrPos, nInsPos, eLang ) )
+ nRet |= CapitalStartSentence;
// Two capital letters at beginning of word ??
if( !bUnsupported &&