[Libreoffice-commits] core.git: editeng/source svl/source svtools/source sw/source
Philipp Riemer
ruderphilipp at gmail.com
Wed Oct 2 08:14:31 PDT 2013
editeng/source/misc/svxacorr.cxx | 8 +++----
editeng/source/rtf/rtfitem.cxx | 40 +++++++++++++++++++--------------------
editeng/source/rtf/svxrtf.cxx | 6 ++---
svl/source/svdde/ddesvr.cxx | 20 +++++++++----------
svtools/source/svrtf/parrtf.cxx | 14 ++++++-------
sw/source/core/doc/docdde.cxx | 6 ++---
sw/source/core/doc/fmtcol.cxx | 18 ++++++++---------
sw/source/core/draw/dpage.cxx | 10 ++++-----
sw/source/ui/app/docstyle.cxx | 6 ++---
sw/source/ui/docvw/edtwin2.cxx | 22 ++++++++++-----------
10 files changed, 75 insertions(+), 75 deletions(-)
New commits:
commit 35607cbcee9bad31c4f635a4ba7f6e98074e4985
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date: Thu Sep 26 19:22:14 2013 +0200
bWeiter -> bContinue
Change-Id: Ia0bba3c1610dce5d364fb584f04e0b66cc41fb20
Reviewed-on: https://gerrit.libreoffice.org/6077
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index eb36b2e..506bb97 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 d397c76..6675edb 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 973d3f6..0331be7 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"
diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx
index f51d08b..0a15b70 100644
--- a/svl/source/svdde/ddesvr.cxx
+++ b/svl/source/svdde/ddesvr.cxx
@@ -384,7 +384,7 @@ DdeTopic* DdeInternal::FindTopic( DdeService& rService, HSZ hTopic )
{
std::vector<DdeTopic*>::iterator iter;
std::vector<DdeTopic*> &rTopics = rService.aTopics;
- bool bWeiter = false;
+ bool bContinue = false;
DdeInstData* pInst = ImpGetInstData();
DBG_ASSERT(pInst,"SVDDE:No instance data");
@@ -396,17 +396,17 @@ DdeTopic* DdeInternal::FindTopic( DdeService& rService, HSZ hTopic )
return *iter;
}
- bWeiter = !bWeiter;
- if( !bWeiter )
+ bContinue = !bContinue;
+ if( !bContinue )
break;
// dann befragen wir doch mal unsere Ableitung:
TCHAR chBuf[250];
DdeQueryString(pInst->hDdeInstSvr,hTopic,chBuf,sizeof(chBuf)/sizeof(TCHAR),CP_WINUNICODE );
- bWeiter = rService.MakeTopic( reinterpret_cast<const sal_Unicode*>(chBuf) );
+ bContinue = rService.MakeTopic( reinterpret_cast<const sal_Unicode*>(chBuf) );
// dann muessen wir noch mal suchen
}
- while( bWeiter );
+ while( bContinue );
return 0;
}
@@ -419,7 +419,7 @@ DdeItem* DdeInternal::FindItem( DdeTopic& rTopic, HSZ hItem )
std::vector<DdeItem*> &rItems = rTopic.aItems;
DdeInstData* pInst = ImpGetInstData();
DBG_ASSERT(pInst,"SVDDE:No instance data");
- bool bWeiter = false;
+ bool bContinue = false;
do
{ // middle check loop
@@ -429,17 +429,17 @@ DdeItem* DdeInternal::FindItem( DdeTopic& rTopic, HSZ hItem )
if ( *(*iter)->pName == hItem )
return *iter;
}
- bWeiter = !bWeiter;
- if( !bWeiter )
+ bContinue = !bContinue;
+ if( !bContinue )
break;
// dann befragen wir doch mal unsere Ableitung:
TCHAR chBuf[250];
DdeQueryString(pInst->hDdeInstSvr,hItem,chBuf,sizeof(chBuf)/sizeof(TCHAR),CP_WINUNICODE );
- bWeiter = rTopic.MakeItem( reinterpret_cast<const sal_Unicode*>(chBuf) );
+ bContinue = rTopic.MakeItem( reinterpret_cast<const sal_Unicode*>(chBuf) );
// dann muessen wir noch mal suchen
}
- while( bWeiter );
+ while( bContinue );
return 0;
}
diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx
index 1974232..6ed6871 100644
--- a/svtools/source/svrtf/parrtf.cxx
+++ b/svtools/source/svrtf/parrtf.cxx
@@ -304,8 +304,8 @@ sal_Unicode SvRTFParser::GetHexValue()
void SvRTFParser::ScanText( const sal_Unicode cBreak )
{
OUStringBuffer aStrBuffer;
- int bWeiter = true;
- while( bWeiter && IsParserWorking() && aStrBuffer.getLength() < MAX_STRING_LEN)
+ int bContinue = true;
+ while( bContinue && IsParserWorking() && aStrBuffer.getLength() < MAX_STRING_LEN)
{
int bNextCh = true;
switch( nNextCh )
@@ -433,7 +433,7 @@ void SvRTFParser::ScanText( const sal_Unicode cBreak )
else
{
nNextCh = '\\';
- bWeiter = false; // Abbrechen, String zusammen
+ bContinue = false; // Abbrechen, String zusammen
}
}
break;
@@ -441,7 +441,7 @@ void SvRTFParser::ScanText( const sal_Unicode cBreak )
default:
rInput.SeekRel( -1 );
nNextCh = '\\';
- bWeiter = false; // Abbrechen, String zusammen
+ bContinue = false; // Abbrechen, String zusammen
break;
}
}
@@ -452,7 +452,7 @@ void SvRTFParser::ScanText( const sal_Unicode cBreak )
// weiter
case '{':
case '}':
- bWeiter = false;
+ bContinue = false;
break;
case 0x0a:
@@ -461,7 +461,7 @@ void SvRTFParser::ScanText( const sal_Unicode cBreak )
default:
if( nNextCh == cBreak || aStrBuffer.getLength() >= MAX_STRING_LEN)
- bWeiter = false;
+ bContinue = false;
else
{
do {
@@ -483,7 +483,7 @@ void SvRTFParser::ScanText( const sal_Unicode cBreak )
}
}
- if( bWeiter && bNextCh )
+ if( bContinue && bNextCh )
nNextCh = GetNextChar();
}
diff --git a/sw/source/core/doc/docdde.cxx b/sw/source/core/doc/docdde.cxx
index 46f2e7d..3591035 100644
--- a/sw/source/core/doc/docdde.cxx
+++ b/sw/source/core/doc/docdde.cxx
@@ -296,7 +296,7 @@ bool SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam,
// but also frames (text!), tables, outlines:
if( STRING_NOTFOUND != nPos )
{
- bool bWeiter = false;
+ bool bContinue = false;
String sName( sItem.Copy( 0, nPos ) );
OUString sCmp( sItem.Copy( nPos + 1 ));
sItem = rCC.lowercase( sItem );
@@ -334,7 +334,7 @@ bool SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam,
else if( sCmp == "region" )
{
sItem = sName; // Is being dealt with further down!
- bWeiter = true;
+ bContinue = true;
}
else if( sCmp == "outline" )
{
@@ -367,7 +367,7 @@ bool SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam,
}
}
- if( !bWeiter )
+ if( !bContinue )
return false;
}
diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx
index ecc4f9e..3ef3472 100644
--- a/sw/source/core/doc/fmtcol.cxx
+++ b/sw/source/core/doc/fmtcol.cxx
@@ -203,7 +203,7 @@ void SwTxtFmtColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
this, pNewNumRuleItem );
}
- int bWeiter = sal_True;
+ int bContinue = sal_True;
// Check against the own attributes
if( pNewLRSpace && SFX_ITEM_SET == GetItemState( RES_LR_SPACE, sal_False,
@@ -238,12 +238,12 @@ void SwTxtFmtColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
if( bChg )
{
SetFmtAttr( aNew );
- bWeiter = 0 != pOldChgSet || bNewParent;
+ bContinue = 0 != pOldChgSet || bNewParent;
}
// We set it to absolute -> do not propagate it further, unless
// we set it!
else if( pNewChgSet )
- bWeiter = pNewChgSet->GetTheChgdSet() == &GetAttrSet();
+ bContinue = pNewChgSet->GetTheChgdSet() == &GetAttrSet();
}
}
@@ -270,12 +270,12 @@ void SwTxtFmtColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
if( bChg )
{
SetFmtAttr( aNew );
- bWeiter = 0 != pOldChgSet || bNewParent;
+ bContinue = 0 != pOldChgSet || bNewParent;
}
// We set it to absolute -> do not propagate it further, unless
// we set it!
else if( pNewChgSet )
- bWeiter = pNewChgSet->GetTheChgdSet() == &GetAttrSet();
+ bContinue = pNewChgSet->GetTheChgdSet() == &GetAttrSet();
}
for( int nC = 0, nArrLen = sizeof(aFontSizeArr) / sizeof( aFontSizeArr[0]);
@@ -293,7 +293,7 @@ void SwTxtFmtColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
// We set it to absolute -> do not propagate it further, unless
// we set it!
if( pNewChgSet )
- bWeiter = pNewChgSet->GetTheChgdSet() == &GetAttrSet();
+ bContinue = pNewChgSet->GetTheChgdSet() == &GetAttrSet();
}
else
{
@@ -305,17 +305,17 @@ void SwTxtFmtColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
if( nTmp != aNew.GetHeight() )
{
SetFmtAttr( aNew );
- bWeiter = 0 != pOldChgSet || bNewParent;
+ bContinue = 0 != pOldChgSet || bNewParent;
}
// We set it to absolute -> do not propagate it further, unless
// we set it!
else if( pNewChgSet )
- bWeiter = pNewChgSet->GetTheChgdSet() == &GetAttrSet();
+ bContinue = pNewChgSet->GetTheChgdSet() == &GetAttrSet();
}
}
}
- if( bWeiter )
+ if( bContinue )
SwFmtColl::Modify( pOld, pNew );
}
diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx
index a512539..4eff6b1 100644
--- a/sw/source/core/draw/dpage.cxx
+++ b/sw/source/core/draw/dpage.cxx
@@ -124,7 +124,7 @@ const SdrPageGridFrameList* SwDPage::GetGridFrameList(
sal_Bool SwDPage::RequestHelp( Window* pWindow, SdrView* pView,
const HelpEvent& rEvt )
{
- sal_Bool bWeiter = sal_True;
+ sal_Bool bContinue = sal_True;
if( rEvt.GetMode() & ( HELPMODE_QUICK | HELPMODE_BALLOON ))
{
@@ -198,15 +198,15 @@ sal_Bool SwDPage::RequestHelp( Window* pWindow, SdrView* pView,
Rectangle aRect( rEvt.GetMousePosPixel(), Size(1,1) );
Help::ShowQuickHelp( pWindow, aRect, sTxt );
}
- bWeiter = sal_False;
+ bContinue = sal_False;
}
}
}
- if( bWeiter )
- bWeiter = !FmFormPage::RequestHelp( pWindow, pView, rEvt );
+ if( bContinue )
+ bContinue = !FmFormPage::RequestHelp( pWindow, pView, rEvt );
- return bWeiter;
+ return bContinue;
}
Reference< XInterface > SwDPage::createUnoPage()
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx
index 901ca80..d46cbe7 100644
--- a/sw/source/ui/app/docstyle.cxx
+++ b/sw/source/ui/app/docstyle.cxx
@@ -2571,7 +2571,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First()
if( (nId & COLL_GET_RANGE_BITS) != COLL_HTML_BITS)
{
// but some we also want to see in this section
- bool bWeiter = true;
+ bool bContinue = true;
switch( nId )
{
case RES_POOLCOLL_SENDADRESS: // --> ADDRESS
@@ -2588,10 +2588,10 @@ SfxStyleSheetBase* SwStyleSheetIterator::First()
case RES_POOLCOLL_STANDARD: // --> P
case RES_POOLCOLL_FOOTNOTE:
case RES_POOLCOLL_ENDNOTE:
- bWeiter = false;
+ bContinue = false;
break;
}
- if( bWeiter )
+ if( bContinue )
continue;
}
break;
diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx
index 6ff0131..6261bf3 100644
--- a/sw/source/ui/docvw/edtwin2.cxx
+++ b/sw/source/ui/docvw/edtwin2.cxx
@@ -102,7 +102,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
bool bQuickBalloon = 0 != (rEvt.GetMode() & ( HELPMODE_QUICK | HELPMODE_BALLOON ));
if(bQuickBalloon && !rSh.GetViewOptions()->IsShowContentTips())
return;
- bool bWeiter = true;
+ bool bContinue = true;
SET_CURR_SHELL(&rSh);
OUString sTxt;
Point aPos( PixelToLogic( ScreenToOutputPixel( rEvt.GetMousePosPixel() ) ));
@@ -116,11 +116,11 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
{
SdrPageView* pPV = pSdrView->GetSdrPageView();
SwDPage* pPage = pPV ? ((SwDPage*)pPV->GetPage()) : 0;
- bWeiter = pPage && pPage->RequestHelp(this, pSdrView, rEvt);
+ bContinue = pPage && pPage->RequestHelp(this, pSdrView, rEvt);
}
}
- if( bWeiter && bQuickBalloon)
+ if( bContinue && bQuickBalloon)
{
SwRect aFldRect;
SwContentAtPos aCntntAtPos( SwContentAtPos::SW_FIELD |
@@ -375,9 +375,9 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
}
}
- bWeiter = false;
+ bContinue = false;
}
- if( bWeiter )
+ if( bContinue )
{
sal_uInt8 nTabCols = rSh.WhichMouseTabCol(aPos);
sal_uInt16 nTabRes = 0;
@@ -414,11 +414,11 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
Rectangle aRect(rEvt.GetMousePosPixel(), aTxtSize);
Help::ShowQuickHelp(this, aRect, sTxt);
}
- bWeiter = false;
+ bContinue = false;
}
}
- if( bWeiter && pSdrView && bQuickBalloon)
+ if( bContinue && pSdrView && bQuickBalloon)
{
SdrViewEvent aVEvt;
SdrHitKind eHit = pSdrView->PickAnything(aPos, aVEvt);
@@ -433,10 +433,10 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
pObj = aVEvt.pObj;
sTxt = pField->GetURL();
- bWeiter = false;
+ bContinue = false;
}
}
- if (bWeiter && eHit == SDRHIT_TEXTEDIT)
+ if (bContinue && eHit == SDRHIT_TEXTEDIT)
{
// look for URL field in DrawText object that is opened for editing
OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView();
@@ -458,7 +458,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
if (pField )
{
sTxt = ((const SvxURLField*) pField)->GetURL();
- bWeiter = false;
+ bContinue = false;
}
}
}
@@ -478,7 +478,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
}
}
- if( bWeiter )
+ if( bContinue )
Window::RequestHelp( rEvt );
}
More information about the Libreoffice-commits
mailing list