diff options
author | Jan Holesovsky <kendy@collabora.com> | 2015-05-26 09:49:42 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2015-05-26 12:20:26 +0200 |
commit | 42f0f1397ad6c36410e26f8bbc04372a754b153d (patch) | |
tree | fdf7493fb4999e04990902e8029c513f020aa081 /sw/source | |
parent | 2cc3adf3a5fa277a6b578bd3cc1cab0d01c897eb (diff) |
Global CptlSttSntnc -> CapitalStartSentence
Change-Id: Id428332201f14b172af1590baed6aa2a67e0557a
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/core/edit/acorrect.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/edit/autofmt.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/inc/acorrect.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/docvw/edtwin.cxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/shells/textsh.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/wrtsh/wrtsh1.cxx | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx index 82255be8a8da..28cb79689b47 100644 --- a/sw/source/core/edit/acorrect.cxx +++ b/sw/source/core/edit/acorrect.cxx @@ -403,7 +403,7 @@ bool SwAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos, // 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 SwAutoCorrDoc::SaveCpltSttWord( sal_uLong nFlag, sal_Int32 nPos, @@ -443,7 +443,7 @@ void SwAutoCorrExceptWord::CheckChar( const SwPosition& rPos, sal_Unicode cChr ) // then add to the list: if (CptlSttWrd & m_nFlags) pACorr->AddWrtSttException(m_sWord, m_eLanguage); - else if (CptlSttSntnc & m_nFlags) + else if (CapitalStartSentence & m_nFlags) pACorr->AddCplSttException(m_sWord, m_eLanguage); } } diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index 75cb288847c6..f7013a9e7870 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -2049,7 +2049,7 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos ) if( m_aFlags.bCapitalStartSentence && bFirst ) { SetRedlineText( STR_AUTOFMTREDL_CPTL_STT_SENT ); - pATst->FnCptlSttSntnc( aACorrDoc, *pText, true, nSttPos, nPos, eLang); + pATst->FnCapitalStartSentence( aACorrDoc, *pText, true, nSttPos, nPos, eLang); } bFirst = bFirstSent; diff --git a/sw/source/core/inc/acorrect.hxx b/sw/source/core/inc/acorrect.hxx index 1f6001822e7f..4a833abf00e1 100644 --- a/sw/source/core/inc/acorrect.hxx +++ b/sw/source/core/inc/acorrect.hxx @@ -80,7 +80,7 @@ public: // Will be called after swapping characters by the functions // - FnCptlSttWrd and - // - FnCptlSttSntnc. + // - FnCapitalStartSentence. // Afterwards the words can be added into exception list if needed. virtual void SaveCpltSttWord( sal_uLong nFlag, sal_Int32 nPos, const OUString& rExceptWord, sal_Unicode cChar ) SAL_OVERRIDE; diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 995c2900b6a7..3db93d423e6c 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -2393,7 +2393,7 @@ KEYINPUT_CHECKTABLE_INSDEL: } else if( !aKeyEvent.GetRepeat() && pACorr && ( bIsAutoCorrectChar || bRunNext ) && pACfg->IsAutoFormatByInput() && - pACorr->IsAutoCorrFlag( CptlSttSntnc | CptlSttWrd | + pACorr->IsAutoCorrFlag( CapitalStartSentence | CptlSttWrd | ChgOrdinalNumber | AddNonBrkSpace | ChgToEnEmDash | SetINetAttr | Autocorrect ) && @@ -2427,7 +2427,7 @@ KEYINPUT_CHECKTABLE_INSDEL: case KS_CheckAutoCorrect: { if( pACorr && pACfg->IsAutoFormatByInput() && - pACorr->IsAutoCorrFlag( CptlSttSntnc | CptlSttWrd | + pACorr->IsAutoCorrFlag( CapitalStartSentence | CptlSttWrd | ChgOrdinalNumber | ChgToEnEmDash | SetINetAttr | Autocorrect ) && diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx index 2cf10fea72b8..3261a8529256 100644 --- a/sw/source/uibase/shells/textsh.cxx +++ b/sw/source/uibase/shells/textsh.cxx @@ -169,7 +169,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) SvxAutoCorrect* pACorr = rACfg.GetAutoCorrect(); if( pACorr && rACfg.IsAutoFormatByInput() && pACorr->IsAutoCorrFlag( - CptlSttSntnc | CptlSttWrd | AddNonBrkSpace | ChgOrdinalNumber | ChgToEnEmDash | SetINetAttr | Autocorrect ) ) + CapitalStartSentence | CptlSttWrd | AddNonBrkSpace | ChgOrdinalNumber | ChgToEnEmDash | SetINetAttr | Autocorrect ) ) { rSh.AutoCorrect( *pACorr, cIns ); } diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index 08422c796ab2..5d1c0d7afaa4 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -137,7 +137,7 @@ using namespace com::sun::star; static SvxAutoCorrect* lcl_IsAutoCorr() { SvxAutoCorrect* pACorr = SvxAutoCorrCfg::Get().GetAutoCorrect(); - if( pACorr && !pACorr->IsAutoCorrFlag( CptlSttSntnc | CptlSttWrd | + if( pACorr && !pACorr->IsAutoCorrFlag( CapitalStartSentence | CptlSttWrd | AddNonBrkSpace | ChgOrdinalNumber | ChgToEnEmDash | SetINetAttr | Autocorrect )) pACorr = 0; |