diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2013-10-04 12:34:30 +0200 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2013-10-04 15:05:04 +0200 |
commit | be62c01287c095c22a83ecfe6f9f45874f6e56f8 (patch) | |
tree | ee40a7558322b4627a564f69dfb92e4c8401bea0 /sw/source | |
parent | 80697835719c5220c68608954ade949b5a7ed503 (diff) |
fdo#39674 fix some spelling
Change-Id: I72e497fb97edf8782c69000576f42896594e1556
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/core/bastyp/swcache.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/edit/autofmt.cxx | 36 |
2 files changed, 19 insertions, 19 deletions
diff --git a/sw/source/core/bastyp/swcache.cxx b/sw/source/core/bastyp/swcache.cxx index f5aab3ef4f7a..539ffe437e6c 100644 --- a/sw/source/core/bastyp/swcache.cxx +++ b/sw/source/core/bastyp/swcache.cxx @@ -40,7 +40,7 @@ void SwCache::Check() SwCacheObj *pTmp = pLast; while ( pTmp && pTmp != pObj ) pTmp = pTmp->GetPrev(); - SAL_WARN_IF( !pTmp, "sw.core", "Objekt not found." ); + SAL_WARN_IF( !pTmp, "sw.core", "Object not found." ); ++nCnt; if ( pObj == pFirst ) diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index 3753f0164461..d42b06771eba 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -189,9 +189,9 @@ class SwAutoFormat bool HasSelBlanks( SwPaM& rPam ) const; bool HasBreakAttr( const SwTxtNode& ) const; void DeleteSel( SwPaM& rPam ); - bool DeleteAktNxtPara( const String& rNxtPara ); + bool DeleteCurNxtPara( const String& rNxtPara ); /// delete in the node start and/or end - void DeleteAktPara( bool bStart = true, bool nEnd = true ); + void DeleteCurrentParagraph( bool bStart = true, bool nEnd = true ); void DelEmptyLine( bool bTstNextPara = true ); /// when using multiline paragraphs delete the "left" and/or /// "right" margins @@ -1063,7 +1063,7 @@ bool SwAutoFormat::IsSentenceAtEnd( const SwTxtNode& rTxtNd ) const } /// Delete beginning and/or end in a node -void SwAutoFormat::DeleteAktPara( bool bStart, bool bEnd ) +void SwAutoFormat::DeleteCurrentParagraph( bool bStart, bool bEnd ) { if( aFlags.bAFmtByInput ? aFlags.bAFmtByInpDelSpacesAtSttEnd @@ -1122,7 +1122,7 @@ void SwAutoFormat::DeleteSel( SwPaM& rDelPam ) pEditShell->DeleteSel( rDelPam ); } -bool SwAutoFormat::DeleteAktNxtPara( const String& rNxtPara ) +bool SwAutoFormat::DeleteCurNxtPara( const String& rNxtPara ) { // delete blanks at the end of the current and at the beginning of the next one aDelPam.DeleteMark(); @@ -1271,7 +1271,7 @@ void SwAutoFormat::BuildIndent() bBreak = !IsFastFullLine( *pNxtNd ) || IsBlanksInString( *pNxtNd ) || IsSentenceAtEnd( *pNxtNd ); - if( DeleteAktNxtPara( pNxtNd->GetTxt() )) + if( DeleteCurNxtPara( pNxtNd->GetTxt() )) { pDoc->InsertString( aDelPam, OUString(' ') ); } @@ -1282,7 +1282,7 @@ void SwAutoFormat::BuildIndent() !CalcLevel( *pNxtNd ) ); } } - DeleteAktPara( true, true ); + DeleteCurrentParagraph( true, true ); AutoCorrect(); } @@ -1311,7 +1311,7 @@ void SwAutoFormat::BuildTextIndent() { bBreak = !IsFastFullLine( *pNxtNd ) || IsBlanksInString( *pNxtNd ) || IsSentenceAtEnd( *pNxtNd ); - if( DeleteAktNxtPara( pNxtNd->GetTxt() ) ) + if( DeleteCurNxtPara( pNxtNd->GetTxt() ) ) { pDoc->InsertString( aDelPam, OUString(' ') ); } @@ -1320,7 +1320,7 @@ void SwAutoFormat::BuildTextIndent() pNxtNd = GetNextNode(); } } - DeleteAktPara( true, true ); + DeleteCurrentParagraph( true, true ); AutoCorrect(); } @@ -1345,7 +1345,7 @@ void SwAutoFormat::BuildText() { bBreak = !IsFastFullLine( *pNxtNd ) || IsBlanksInString( *pNxtNd ) || IsSentenceAtEnd( *pNxtNd ); - if( DeleteAktNxtPara( pNxtNd->GetTxt() ) ) + if( DeleteCurNxtPara( pNxtNd->GetTxt() ) ) { pDoc->InsertString( aDelPam, OUString(' ') ); } @@ -1357,7 +1357,7 @@ void SwAutoFormat::BuildText() break; } } - DeleteAktPara( true, true ); + DeleteCurrentParagraph( true, true ); AutoCorrect(); } @@ -1390,7 +1390,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel ) IsBlanksInString( *pAktTxtNd ) || IsSentenceAtEnd( *pAktTxtNd ); sal_Bool bRTL = pEditShell->IsInRightToLeftText(); - DeleteAktPara( true, true ); + DeleteCurrentParagraph( true, true ); bool bChgBullet = false, bChgEnum = false; xub_StrLen nAutoCorrPos = 0; @@ -1658,7 +1658,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel ) SetRedlineTxt( STR_AUTOFMTREDL_DEL_MORELINES ); bBreak = !IsFastFullLine( *pNxtNd ) || IsBlanksInString( *pNxtNd ) || IsSentenceAtEnd( *pNxtNd ); - if( DeleteAktNxtPara( pNxtNd->GetTxt() ) ) + if( DeleteCurNxtPara( pNxtNd->GetTxt() ) ) { pDoc->InsertString( aDelPam, OUString(' ') ); } @@ -1669,7 +1669,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel ) if(!pNxtNd || pCurrNode == pNxtNd) break; } - DeleteAktPara( false, true ); + DeleteCurrentParagraph( false, true ); AutoCorrect( nAutoCorrPos ); } @@ -1745,7 +1745,7 @@ void SwAutoFormat::BuildNegIndent( SwTwips nSpaces ) bBreak = !IsFastFullLine( *pNxtNd ) || IsBlanksInString( *pNxtNd ) || IsSentenceAtEnd( *pNxtNd ); - if( DeleteAktNxtPara( pNxtNd->GetTxt() ) ) + if( DeleteCurNxtPara( pNxtNd->GetTxt() ) ) { pDoc->InsertString( aDelPam, OUString(' ') ); } @@ -1754,7 +1754,7 @@ void SwAutoFormat::BuildNegIndent( SwTwips nSpaces ) pNxtNd = GetNextNode(); } } - DeleteAktPara( true, true ); + DeleteCurrentParagraph( true, true ); AutoCorrect(); } @@ -1775,8 +1775,8 @@ void SwAutoFormat::BuildHeadLine( sal_uInt16 nLvl ) DelPrevPara(); - DeleteAktPara( true, false ); - DeleteAktNxtPara( aEmptyStr ); + DeleteCurrentParagraph( true, false ); + DeleteCurNxtPara( aEmptyStr ); aDelPam.DeleteMark(); aDelPam.GetPoint()->nNode = aNdIdx.GetIndex() + 1; @@ -1785,7 +1785,7 @@ void SwAutoFormat::BuildHeadLine( sal_uInt16 nLvl ) } else { - DeleteAktPara( true, true ); + DeleteCurrentParagraph( true, true ); AutoCorrect(); } } |