summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorPhilipp Riemer <ruderphilipp@gmail.com>2013-09-26 19:22:14 +0200
committerCaolán McNamara <caolanm@redhat.com>2013-10-02 15:14:09 +0000
commit35607cbcee9bad31c4f635a4ba7f6e98074e4985 (patch)
tree751333dfd1cc15927aa9abcb4f24794e36c58762 /editeng
parent4f9071a043b5fef867dda289faaf972d009d185e (diff)
bWeiter -> bContinue
Change-Id: Ia0bba3c1610dce5d364fb584f04e0b66cc41fb20 Reviewed-on: https://gerrit.libreoffice.org/6077 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/misc/svxacorr.cxx8
-rw-r--r--editeng/source/rtf/rtfitem.cxx40
-rw-r--r--editeng/source/rtf/svxrtf.cxx6
3 files changed, 27 insertions, 27 deletions
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index eb36b2e69951..506bb97932e2 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -914,7 +914,7 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
const sal_Unicode* pExceptStt = 0;
if( !bAtStart )
{
- sal_Bool bWeiter = sal_True;
+ sal_Bool bContinue = sal_True;
int nFlag = C_NONE;
do {
switch( *pStr )
@@ -959,15 +959,15 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
if( !nFlag )
return sal_False; // no valid separator -> no replacement
else
- bWeiter = sal_False;
+ bContinue = sal_False;
break;
}
- if( bWeiter && pStr-- == pStart )
+ if( bContinue && pStr-- == pStart )
{
return sal_False; // no valid separator -> no replacement
}
- } while( bWeiter );
+ } while( bContinue );
if( C_FULL_STOP != nFlag )
pExceptStt = 0;
}
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index d397c767a128..6675edba5380 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -208,7 +208,7 @@ void SvxRTFParser::SetScriptAttr( RTF_CharTypeDef eType, SfxItemSet& rSet,
void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
{
DBG_ASSERT( pSet, "A SfxItemSet has to be provided as argument!" );
- int bFirstToken = sal_True, bWeiter = sal_True;
+ int bFirstToken = sal_True, bContinue = sal_True;
sal_uInt16 nStyleNo = 0; // default
FontUnderline eUnderline;
FontUnderline eOverline;
@@ -219,7 +219,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
int bChkStkPos = !bNewGroup && !aAttrStack.empty();
- while( bWeiter && IsParserWorking() ) // as long as known Attribute are recognized
+ while( bContinue && IsParserWorking() ) // as long as known Attribute are recognized
{
switch( nToken )
{
@@ -287,7 +287,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
{
if( !bFirstToken )
SkipToken( -1 );
- bWeiter = sal_False;
+ bContinue = sal_False;
}
else
{
@@ -1257,7 +1257,7 @@ ATTR_SETEMPHASIS:
if (!bFirstToken)
--nSkip; // BRACELEFT: is the next token
SkipToken( nSkip );
- bWeiter = sal_False;
+ bContinue = sal_False;
}
}
break;
@@ -1273,11 +1273,11 @@ ATTR_SETEMPHASIS:
// unknown token, so token "returned in Parser"
if( !bFirstToken )
SkipToken( -1 );
- bWeiter = sal_False;
+ bContinue = sal_False;
}
}
}
- if( bWeiter )
+ if( bContinue )
{
nToken = GetNextToken();
}
@@ -1291,7 +1291,7 @@ void SvxRTFParser::ReadTabAttr( int nToken, SfxItemSet& rSet )
// then read all the TabStops
SvxTabStop aTabStop;
SvxTabStopItem aAttr( 0, 0, SVX_TAB_ADJUST_DEFAULT, PARDID->nTabStop );
- int bWeiter = sal_True;
+ int bContinue = sal_True;
do {
switch( nToken )
{
@@ -1344,20 +1344,20 @@ void SvxRTFParser::ReadTabAttr( int nToken, SfxItemSet& rSet )
if( nSkip )
{
SkipToken( nSkip ); // Ignore back again
- bWeiter = sal_False;
+ bContinue = sal_False;
}
}
break;
default:
- bWeiter = sal_False;
+ bContinue = sal_False;
}
- if( bWeiter )
+ if( bContinue )
{
nToken = GetNextToken();
bMethodOwnsToken = true;
}
- } while( bWeiter );
+ } while( bContinue );
// Fill with defaults is still missing!
rSet.Put( aAttr );
@@ -1403,7 +1403,7 @@ void SvxRTFParser::ReadBorderAttr( int nToken, SfxItemSet& rSet,
aAttr = *(SvxBoxItem*)pItem;
SvxBorderLine aBrd( 0, DEF_LINE_WIDTH_0 ); // Simple plain line
- int bWeiter = sal_True, nBorderTyp = 0;
+ int bContinue = sal_True, nBorderTyp = 0;
long nWidth = 1;
bool bDoubleWidth = false;
@@ -1558,11 +1558,11 @@ void SvxRTFParser::ReadBorderAttr( int nToken, SfxItemSet& rSet,
break;
default:
- bWeiter = (nToken & ~(0xff| RTF_SWGDEFS)) == RTF_BRDRDEF;
+ bContinue = (nToken & ~(0xff| RTF_SWGDEFS)) == RTF_BRDRDEF;
}
- if( bWeiter )
+ if( bContinue )
nToken = GetNextToken();
- } while( bWeiter );
+ } while( bContinue );
// Finally compute the border width
if ( bDoubleWidth ) nWidth *= 2;
@@ -1585,7 +1585,7 @@ void SvxRTFParser::ReadBackgroundAttr( int nToken, SfxItemSet& rSet,
int bTableDef )
{
// then read the border attribute
- int bWeiter = sal_True;
+ int bContinue = sal_True;
sal_uInt16 nColor = USHRT_MAX, nFillColor = USHRT_MAX;
sal_uInt8 nFillValue = 0;
@@ -1660,13 +1660,13 @@ void SvxRTFParser::ReadBackgroundAttr( int nToken, SfxItemSet& rSet,
default:
if( bTableDef )
- bWeiter = (nToken & ~(0xff | RTF_TABLEDEF) ) == RTF_SHADINGDEF;
+ bContinue = (nToken & ~(0xff | RTF_TABLEDEF) ) == RTF_SHADINGDEF;
else
- bWeiter = (nToken & ~0xff) == RTF_SHADINGDEF;
+ bContinue = (nToken & ~0xff) == RTF_SHADINGDEF;
}
- if( bWeiter )
+ if( bContinue )
nToken = GetNextToken();
- } while( bWeiter );
+ } while( bContinue );
Color aCol( COL_WHITE ), aFCol;
if( !nFillValue )
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 973d3f6aee72..0331be70aa66 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -641,9 +641,9 @@ OUString& SvxRTFParser::GetTextToEndGroup( OUString& rStr )
util::DateTime SvxRTFParser::GetDateTimeStamp( )
{
util::DateTime aDT;
- sal_Bool bWeiter = sal_True;
+ sal_Bool bContinue = sal_True;
- while( bWeiter && IsParserWorking() )
+ while( bContinue && IsParserWorking() )
{
int nToken = GetNextToken();
switch( nToken )
@@ -654,7 +654,7 @@ util::DateTime SvxRTFParser::GetDateTimeStamp( )
case RTF_HR: aDT.Hours = (sal_uInt16)nTokenValue; break;
case RTF_MIN: aDT.Minutes = (sal_uInt16)nTokenValue; break;
default:
- bWeiter = sal_False;
+ bContinue = sal_False;
}
}
SkipToken( -1 ); // the closing brace is evaluated "above"