Kaydet (Commit) 518d6411 authored tarafından Thomas Arnhold's avatar Thomas Arnhold

remove germanism: bEnde -> bEnd

üst 0c4d6f58
...@@ -132,7 +132,7 @@ class SwAutoFormat ...@@ -132,7 +132,7 @@ class SwAutoFormat
IS_ENDE IS_ENDE
} eStat; } eStat;
bool bEnde : 1; bool bEnd : 1;
bool bEmptyLine : 1; bool bEmptyLine : 1;
bool bMoreLines : 1; bool bMoreLines : 1;
...@@ -205,7 +205,7 @@ class SwAutoFormat ...@@ -205,7 +205,7 @@ class SwAutoFormat
bool CanJoin( const SwTxtNode* pTxtNd ) const bool CanJoin( const SwTxtNode* pTxtNd ) const
{ {
return !bEnde && pTxtNd && return !bEnd && pTxtNd &&
!IsEmptyLine( *pTxtNd ) && !IsEmptyLine( *pTxtNd ) &&
!IsNoAlphaLine( *pTxtNd) && !IsNoAlphaLine( *pTxtNd) &&
!IsEnumericChar( *pTxtNd ) && !IsEnumericChar( *pTxtNd ) &&
...@@ -307,14 +307,14 @@ OUString SwAutoFormat::GoNextPara() ...@@ -307,14 +307,14 @@ OUString SwAutoFormat::GoNextPara()
// has to be checked twice before and after incrementation // has to be checked twice before and after incrementation
if( aNdIdx.GetIndex() >= aEndNdIdx.GetIndex() ) if( aNdIdx.GetIndex() >= aEndNdIdx.GetIndex() )
{ {
bEnde = true; bEnd = true;
return OUString(); return OUString();
} }
aNdIdx++; aNdIdx++;
if( aNdIdx.GetIndex() >= aEndNdIdx.GetIndex() ) if( aNdIdx.GetIndex() >= aEndNdIdx.GetIndex() )
{ {
bEnde = true; bEnd = true;
return OUString(); return OUString();
} }
else else
...@@ -326,7 +326,7 @@ OUString SwAutoFormat::GoNextPara() ...@@ -326,7 +326,7 @@ OUString SwAutoFormat::GoNextPara()
// EndNode : at the end, terminate // EndNode : at the end, terminate
if( pNewNd->IsEndNode() ) if( pNewNd->IsEndNode() )
{ {
bEnde = true; bEnd = true;
return OUString(); return OUString();
} }
else if( pNewNd->IsTableNode() ) else if( pNewNd->IsTableNode() )
...@@ -1267,7 +1267,7 @@ void SwAutoFormat::BuildIndent() ...@@ -1267,7 +1267,7 @@ void SwAutoFormat::BuildIndent()
{ {
SetRedlineTxt( STR_AUTOFMTREDL_DEL_MORELINES ); SetRedlineTxt( STR_AUTOFMTREDL_DEL_MORELINES );
const SwTxtNode* pNxtNd = GetNextNode(); const SwTxtNode* pNxtNd = GetNextNode();
if( pNxtNd && !bEnde ) if( pNxtNd && !bEnd )
{ {
do { do {
bBreak = !IsFastFullLine( *pNxtNd ) || bBreak = !IsFastFullLine( *pNxtNd ) ||
...@@ -2133,7 +2133,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags, ...@@ -2133,7 +2133,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
else else
bEmptyLine = true; // at document beginning bEmptyLine = true; // at document beginning
bEnde = false; bEnd = false;
// set value for percentage display // set value for percentage display
nEndNdIdx = aEndNdIdx.GetIndex(); nEndNdIdx = aEndNdIdx.GetIndex();
...@@ -2169,14 +2169,14 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags, ...@@ -2169,14 +2169,14 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
// This is the automat for autoformatting // This is the automat for autoformatting
eStat = READ_NEXT_PARA; eStat = READ_NEXT_PARA;
while( !bEnde ) while( !bEnd )
{ {
switch( eStat ) switch( eStat )
{ {
case READ_NEXT_PARA: case READ_NEXT_PARA:
{ {
GoNextPara(); GoNextPara();
eStat = bEnde ? IS_ENDE : TST_EMPTY_LINE; eStat = bEnd ? IS_ENDE : TST_EMPTY_LINE;
} }
break; break;
...@@ -2422,7 +2422,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags, ...@@ -2422,7 +2422,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
BuildTextIndent(); BuildTextIndent();
eStat = READ_NEXT_PARA; eStat = READ_NEXT_PARA;
} }
else if( nLevel && pNxtNd && !bEnde && else if( nLevel && pNxtNd && !bEnd &&
!bNxtEmpty && !bNxtAlpha && !nNxtLevel && !bNxtEmpty && !bNxtAlpha && !nNxtLevel &&
!IsEnumericChar( *pNxtNd ) ) !IsEnumericChar( *pNxtNd ) )
{ {
...@@ -2448,7 +2448,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags, ...@@ -2448,7 +2448,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
BuildText(); BuildText();
eStat = READ_NEXT_PARA; eStat = READ_NEXT_PARA;
} }
else if( !nLevel && pNxtNd && !bEnde && else if( !nLevel && pNxtNd && !bEnd &&
!bNxtEmpty && !bNxtAlpha && nNxtLevel && !bNxtEmpty && !bNxtAlpha && nNxtLevel &&
!IsEnumericChar( *pNxtNd ) ) !IsEnumericChar( *pNxtNd ) )
{ {
...@@ -2521,7 +2521,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags, ...@@ -2521,7 +2521,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
break; break;
case IS_ENDE: case IS_ENDE:
bEnde = true; bEnd = true;
break; break;
} }
} }
......
...@@ -56,9 +56,9 @@ void SwPamRanges::Insert( const SwNodeIndex& rIdx1, const SwNodeIndex& rIdx2 ) ...@@ -56,9 +56,9 @@ void SwPamRanges::Insert( const SwNodeIndex& rIdx1, const SwNodeIndex& rIdx2 )
return; // done, because by precondition everything is combined return; // done, because by precondition everything is combined
} }
bool bEnde; bool bEnd;
do { do {
bEnde = true; bEnd = true;
// combine with predecessor? // combine with predecessor?
if( nPos > 0 ) if( nPos > 0 )
...@@ -68,7 +68,7 @@ void SwPamRanges::Insert( const SwNodeIndex& rIdx1, const SwNodeIndex& rIdx2 ) ...@@ -68,7 +68,7 @@ void SwPamRanges::Insert( const SwNodeIndex& rIdx1, const SwNodeIndex& rIdx2 )
|| rTmp.nEnd+1 == aRg.nStart ) || rTmp.nEnd+1 == aRg.nStart )
{ {
aRg.nStart = rTmp.nStart; aRg.nStart = rTmp.nStart;
bEnde = false; bEnd = false;
erase( begin() + --nPos ); // combine erase( begin() + --nPos ); // combine
} }
// range contained in rTmp? // range contained in rTmp?
...@@ -83,7 +83,7 @@ void SwPamRanges::Insert( const SwNodeIndex& rIdx1, const SwNodeIndex& rIdx2 ) ...@@ -83,7 +83,7 @@ void SwPamRanges::Insert( const SwNodeIndex& rIdx1, const SwNodeIndex& rIdx2 )
rTmp.nStart == aRg.nEnd+1 ) rTmp.nStart == aRg.nEnd+1 )
{ {
aRg.nEnd = rTmp.nEnd; aRg.nEnd = rTmp.nEnd;
bEnde = false; bEnd = false;
erase( begin() + nPos ); // combine erase( begin() + nPos ); // combine
} }
...@@ -91,7 +91,7 @@ void SwPamRanges::Insert( const SwNodeIndex& rIdx1, const SwNodeIndex& rIdx2 ) ...@@ -91,7 +91,7 @@ void SwPamRanges::Insert( const SwNodeIndex& rIdx1, const SwNodeIndex& rIdx2 )
else if( rTmp.nStart <= aRg.nStart && aRg.nEnd <= rTmp.nEnd ) else if( rTmp.nStart <= aRg.nStart && aRg.nEnd <= rTmp.nEnd )
return; return;
} }
} while( !bEnde ); } while( !bEnd );
_SwPamRanges::insert( aRg ); _SwPamRanges::insert( aRg );
} }
......
...@@ -766,7 +766,7 @@ void DrawObjkList( SvStream& rInp, OutputDevice& rOut ) ...@@ -766,7 +766,7 @@ void DrawObjkList( SvStream& rInp, OutputDevice& rOut )
{ {
ObjkType aObjk; ObjkType aObjk;
sal_uInt16 nGrpCnt=0; sal_uInt16 nGrpCnt=0;
bool bEnde=false; bool bEnd=false;
do { do {
ReadObjkType( rInp, aObjk ); ReadObjkType( rInp, aObjk );
if (!rInp.GetError()) { if (!rInp.GetError()) {
...@@ -833,13 +833,13 @@ void DrawObjkList( SvStream& rInp, OutputDevice& rOut ) ...@@ -833,13 +833,13 @@ void DrawObjkList( SvStream& rInp, OutputDevice& rOut )
} // if rInp } // if rInp
if (!rInp.GetError()) { if (!rInp.GetError()) {
if (aObjk.Next==0L) { if (aObjk.Next==0L) {
if (nGrpCnt==0) bEnde=true; if (nGrpCnt==0) bEnd=true;
else nGrpCnt--; else nGrpCnt--;
} }
} else { } else {
bEnde=true; // read error bEnd=true; // read error
} }
} while (!bEnde); } while (!bEnd);
} }
/************************************************************************* /*************************************************************************
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment