Global CptlSttWrd and CptlSttWord -> CapitalStartWord

Change-Id: I550456ae319a6a865f2ee951a1ddf70384ce33ef
(cherry picked from commit 9fadc1dc4753862a41569651cf6357234e5e3333)

3 files changed, 14 insertions, 14 deletions

diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx
index fc746e15fde4..a60392ada986 100644
--- a/editeng/source/misc/acorrcfg.cxx
+++ b/editeng/source/misc/acorrcfg.cxx
@@ -154,7 +154,7 @@ void SvxBaseAutoCorrCfg::Load(bool bInit)
                     break;//"UseReplacementTable",
                     case  3:
                         if(*static_cast<sal_Bool const *>(pValues[nProp].getValue()))
-                            nFlags |= CptlSttWrd;
+                            nFlags |= CapitalStartWord;
                     break;//"TwoCapitalsAtStart",
                     case  4:
                         if(*static_cast<sal_Bool const *>(pValues[nProp].getValue()))
@@ -263,7 +263,7 @@ void SvxBaseAutoCorrCfg::ImplCommit()
                 pValues[nProp].setValue(&bVal, rType);
             break;//"UseReplacementTable",
             case  3:
-                bVal = 0 != (nFlags & CptlSttWrd);
+                bVal = 0 != (nFlags & CapitalStartWord);
                 pValues[nProp].setValue(&bVal, rType);
             break;//"TwoCapitalsAtStart",
             case  4:
@@ -412,7 +412,7 @@ void SvxSwAutoCorrCfg::Load(bool bInit)
                     case   4: rParent.bSearchInAllCategories = *static_cast<sal_Bool const *>(pValues[nProp].getValue());  break; //"Text/SearchInAllCategories"
                     case   5: rSwFlags.bAutoCorrect = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/Option/UseReplacementTable",
                     case   6: rSwFlags.bCapitalStartSentence = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/Option/TwoCapitalsAtStart",
-                    case   7: rSwFlags.bCptlSttWrd = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/Option/CapitalAtStartSentence",
+                    case   7: rSwFlags.bCapitalStartWord = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/Option/CapitalAtStartSentence",
                     case   8: rSwFlags.bChgWeightUnderl = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/Option/ChangeUnderlineWeight",
                     case   9: rSwFlags.bSetINetAttr = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/Option/SetInetAttribute",
                     case  10: rSwFlags.bChgOrdinalNumber = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/Option/ChangeOrdinalNumber",
@@ -566,7 +566,7 @@ void SvxSwAutoCorrCfg::ImplCommit()
             case   4: pValues[nProp].setValue(&rParent.bSearchInAllCategories, rType );break; //"Text/SearchInAllCategories"
             case   5: bVal = rSwFlags.bAutoCorrect; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/UseReplacementTable",
             case   6: bVal = rSwFlags.bCapitalStartSentence; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/TwoCapitalsAtStart",
-            case   7: bVal = rSwFlags.bCptlSttWrd; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/CapitalAtStartSentence",
+            case   7: bVal = rSwFlags.bCapitalStartWord; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/CapitalAtStartSentence",
             case   8: bVal = rSwFlags.bChgWeightUnderl; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/ChangeUnderlineWeight",
             case   9: bVal = rSwFlags.bSetINetAttr; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/SetInetAttribute",
             case  10: bVal = rSwFlags.bChgOrdinalNumber; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/ChangeOrdinalNumber",
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index ed78298358c2..4f2027828f3f 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -174,7 +174,7 @@ SvxAutoCorrDoc::~SvxAutoCorrDoc()
 }
 
 // Called by the functions:
-//  - FnCptlSttWrd
+//  - FnCapitalStartWord
 //  - FnCapitalStartSentence
 // after the exchange of characters. Then the words, if necessary, can be inserted
 // into the exception list.
@@ -251,7 +251,7 @@ long SvxAutoCorrect::GetDefaultFlags()
 {
     long nRet = Autocorrect
                     | CapitalStartSentence
-                    | CptlSttWrd
+                    | CapitalStartWord
                     | ChgOrdinalNumber
                     | ChgToEnEmDash
                     | AddNonBrkSpace
@@ -342,7 +342,7 @@ void SvxAutoCorrect::SetAutoCorrFlag( long nFlag, bool bOn )
     {
         if( (nOld & CapitalStartSentence) != (nFlags & CapitalStartSentence) )
             nFlags &= ~CplSttLstLoad;
-        if( (nOld & CptlSttWrd) != (nFlags & CptlSttWrd) )
+        if( (nOld & CapitalStartWord) != (nFlags & CapitalStartWord) )
             nFlags &= ~WrdSttLstLoad;
         if( (nOld & Autocorrect) != (nFlags & Autocorrect) )
             nFlags &= ~ChgWordLstLoad;
@@ -351,7 +351,7 @@ void SvxAutoCorrect::SetAutoCorrFlag( long nFlag, bool bOn )
 
 
     // Two capital letters at the beginning of word?
-bool SvxAutoCorrect::FnCptlSttWrd( SvxAutoCorrDoc& rDoc, const OUString& rTxt,
+bool SvxAutoCorrect::FnCapitalStartWord( SvxAutoCorrDoc& rDoc, const OUString& rTxt,
                                     sal_Int32 nSttPos, sal_Int32 nEndPos,
                                     LanguageType eLang )
 {
@@ -430,7 +430,7 @@ bool SvxAutoCorrect::FnCptlSttWrd( SvxAutoCorrDoc& rDoc, const OUString& rTxt,
                 if( sChar[0] != cSave && rDoc.ReplaceRange( nSttPos, 1, sChar ))
                 {
                     if( SaveWordWrdSttLst & nFlags )
-                        rDoc.SaveCpltSttWord( CptlSttWrd, nSttPos, sWord, cSave );
+                        rDoc.SaveCpltSttWord( CapitalStartWord, nSttPos, sWord, cSave );
                     bRet = true;
                 }
             }
@@ -1420,9 +1420,9 @@ SvxAutoCorrect::DoAutoCorrect( SvxAutoCorrDoc& rDoc, const OUString& rTxt,
 
             // Two capital letters at beginning of word ??
             if( !bUnsupported &&
-                IsAutoCorrFlag( CptlSttWrd ) &&
-                FnCptlSttWrd( rDoc, rTxt, nCapLttrPos, nInsPos, eLang ) )
-                nRet |= CptlSttWrd;
+                IsAutoCorrFlag( CapitalStartWord ) &&
+                FnCapitalStartWord( rDoc, rTxt, nCapLttrPos, nInsPos, eLang ) )
+                nRet |= CapitalStartWord;
 
             if( IsAutoCorrFlag( ChgToEnEmDash ) &&
                 FnChgToEnEmDash( rDoc, rTxt, nCapLttrPos, nInsPos, eLang ) )
diff --git a/editeng/source/misc/swafopt.cxx b/editeng/source/misc/swafopt.cxx
index 22910b737a4b..f146bf5afa87 100644
--- a/editeng/source/misc/swafopt.cxx
+++ b/editeng/source/misc/swafopt.cxx
@@ -27,7 +27,7 @@ SvxSwAutoFormatFlags::SvxSwAutoFormatFlags()
 {
     bAutoCorrect =
     bCapitalStartSentence =
-    bCptlSttWrd =
+    bCapitalStartWord =
     bChkFontAttr =
     bChgUserColl =
     bChgEnumNum =
@@ -85,7 +85,7 @@ SvxSwAutoFormatFlags& SvxSwAutoFormatFlags::operator=( const SvxSwAutoFormatFlag
 {
     bAutoCorrect = rAFFlags.bAutoCorrect;
     bCapitalStartSentence = rAFFlags.bCapitalStartSentence;
-    bCptlSttWrd = rAFFlags.bCptlSttWrd;
+    bCapitalStartWord = rAFFlags.bCapitalStartWord;
     bChkFontAttr = rAFFlags.bChkFontAttr;
 
     bChgUserColl = rAFFlags.bChgUserColl;