bCptlSttSntnc -> bCapitalStartSentence

Change-Id: Ie22198837257163fd7211e93d97d97be2bca4b64

5 files changed, 13 insertions, 13 deletions

diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index c4a91772b2fe..21678fdca5dc 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -537,8 +537,8 @@ bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet*  )
                         m_pCheckLB->IsChecked(CORR_UPPER, CBCOL_SECOND));
 
     bCheck = m_pCheckLB->IsChecked(BEGIN_UPPER, CBCOL_FIRST);
-    bModified |= pOpt->bCptlSttSntnc != bCheck;
-    pOpt->bCptlSttSntnc = bCheck;
+    bModified |= pOpt->bCapitalStartSentence != bCheck;
+    pOpt->bCapitalStartSentence = bCheck;
     pAutoCorrect->SetAutoCorrFlag(CptlSttSntnc,
                         m_pCheckLB->IsChecked(BEGIN_UPPER, CBCOL_SECOND));
 
@@ -673,7 +673,7 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet* )
     m_pCheckLB->CheckEntryPos( USE_REPLACE_TABLE,  CBCOL_SECOND,   0 != (nFlags & Autocorrect));
     m_pCheckLB->CheckEntryPos( CORR_UPPER,         CBCOL_FIRST,    pOpt->bCptlSttWrd );
     m_pCheckLB->CheckEntryPos( CORR_UPPER,         CBCOL_SECOND,   0 != (nFlags & CptlSttWrd) );
-    m_pCheckLB->CheckEntryPos( BEGIN_UPPER,        CBCOL_FIRST,    pOpt->bCptlSttSntnc );
+    m_pCheckLB->CheckEntryPos( BEGIN_UPPER,        CBCOL_FIRST,    pOpt->bCapitalStartSentence );
     m_pCheckLB->CheckEntryPos( BEGIN_UPPER,        CBCOL_SECOND,   0 != (nFlags & CptlSttSntnc) );
     m_pCheckLB->CheckEntryPos( BOLD_UNDERLINE,     CBCOL_FIRST,    pOpt->bChgWeightUnderl );
     m_pCheckLB->CheckEntryPos( BOLD_UNDERLINE,     CBCOL_SECOND,   0 != (nFlags & ChgWeightUnderl) );
diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx
index 325e787217dd..31e4fecd80c2 100644
--- a/editeng/source/misc/acorrcfg.cxx
+++ b/editeng/source/misc/acorrcfg.cxx
@@ -411,7 +411,7 @@ void SvxSwAutoCorrCfg::Load(bool bInit)
                     case   3: rParent.bAutoTextTip = *static_cast<sal_Bool const *>(pValues[nProp].getValue());  break; // "Text/ShowToolTip",
                     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.bCptlSttSntnc = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/Option/TwoCapitalsAtStart",
+                    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   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",
@@ -565,7 +565,7 @@ void SvxSwAutoCorrCfg::ImplCommit()
             case   3: pValues[nProp].setValue(&rParent.bAutoTextTip, rType); break; // "Text/ShowToolTip",
             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.bCptlSttSntnc; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/TwoCapitalsAtStart",
+            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   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",
diff --git a/editeng/source/misc/swafopt.cxx b/editeng/source/misc/swafopt.cxx
index 31f085c805c1..22910b737a4b 100644
--- a/editeng/source/misc/swafopt.cxx
+++ b/editeng/source/misc/swafopt.cxx
@@ -26,7 +26,7 @@ SvxSwAutoFormatFlags::SvxSwAutoFormatFlags()
                     Size( 0, 14 ) )
 {
     bAutoCorrect =
-    bCptlSttSntnc =
+    bCapitalStartSentence =
     bCptlSttWrd =
     bChkFontAttr =
     bChgUserColl =
@@ -84,7 +84,7 @@ SvxSwAutoFormatFlags::SvxSwAutoFormatFlags()
 SvxSwAutoFormatFlags& SvxSwAutoFormatFlags::operator=( const SvxSwAutoFormatFlags& rAFFlags )
 {
     bAutoCorrect = rAFFlags.bAutoCorrect;
-    bCptlSttSntnc = rAFFlags.bCptlSttSntnc;
+    bCapitalStartSentence = rAFFlags.bCapitalStartSentence;
     bCptlSttWrd = rAFFlags.bCptlSttWrd;
     bChkFontAttr = rAFFlags.bChkFontAttr;
 
diff --git a/include/editeng/swafopt.hxx b/include/editeng/swafopt.hxx
index 5cf829d94ff8..6929228d6ef4 100644
--- a/include/editeng/swafopt.hxx
+++ b/include/editeng/swafopt.hxx
@@ -76,7 +76,7 @@ struct EDITENG_DLLPUBLIC SvxSwAutoFormatFlags
     sal_uInt8 nRightMargin;
 
     bool bAutoCorrect : 1;
-    bool bCptlSttSntnc : 1;
+    bool bCapitalStartSentence : 1;
     bool bCptlSttWrd : 1;
     bool bChkFontAttr : 1;
 
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index af48083d1141..75cb288847c6 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -1785,7 +1785,7 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
 
     if( m_aFlags.bAFormatByInput ||
         (!m_aFlags.bAutoCorrect && !bReplaceQuote && !bReplaceSglQuote &&
-        !m_aFlags.bCptlSttSntnc && !m_aFlags.bCptlSttWrd &&
+        !m_aFlags.bCapitalStartSentence && !m_aFlags.bCptlSttWrd &&
         !m_aFlags.bChgOrdinalNumber &&
         !m_aFlags.bChgToEnEmDash && !m_aFlags.bSetINetAttr &&
         !m_aFlags.bChgWeightUnderl && !m_aFlags.bAddNonBrkSpace) )
@@ -1797,7 +1797,7 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
 
     bool bGetLanguage = m_aFlags.bChgOrdinalNumber ||
                         m_aFlags.bChgToEnEmDash || m_aFlags.bSetINetAttr ||
-                        m_aFlags.bCptlSttWrd || m_aFlags.bCptlSttSntnc ||
+                        m_aFlags.bCptlSttWrd || m_aFlags.bCapitalStartSentence ||
                         m_aFlags.bAddNonBrkSpace;
 
     m_aDelPam.DeleteMark();
@@ -1809,7 +1809,7 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
     SwTextFrmInfo aFInfo( 0 );
 
     sal_Int32 nSttPos, nLastBlank = nPos;
-    bool bFirst = m_aFlags.bCptlSttSntnc, bFirstSent = bFirst;
+    bool bFirst = m_aFlags.bCapitalStartSentence, bFirstSent = bFirst;
     sal_Unicode cChar = 0;
 
     CharClass& rAppCC = GetAppCharClass();
@@ -1973,7 +1973,7 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
             case '.':
             case '!':
             case '?':
-                if( m_aFlags.bCptlSttSntnc )
+                if( m_aFlags.bCapitalStartSentence )
                     bFirstSent = true;
                 /* fallthrough */
             default:
@@ -2046,7 +2046,7 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
                     pATst->FnCptlSttWrd( aACorrDoc, *pText, nSttPos, nPos, eLang );
                 }
                 // capital letter at the beginning of a sentence?
-                if( m_aFlags.bCptlSttSntnc && bFirst )
+                if( m_aFlags.bCapitalStartSentence && bFirst )
                 {
                     SetRedlineText( STR_AUTOFMTREDL_CPTL_STT_SENT );
                     pATst->FnCptlSttSntnc( aACorrDoc, *pText, true, nSttPos, nPos, eLang);