diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-14 21:09:59 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-14 21:28:08 +0100 |
| commit | 5ea58f534b9226ef8f5c9589066ce20e3c64e0d8 (patch) | |
| tree | 2a2bbad144a56854b404510a9191845eb7646e40 /editeng/source/rtf | |
| parent | d24134b6a2e6a557bfa17f521e18a01b17e24d98 (diff) | |
bool improvements
Change-Id: Ic6488ac278cac2d1d7e240abff545f9ea0b8eafe
Diffstat (limited to 'editeng/source/rtf')
| -rw-r--r-- | editeng/source/rtf/rtfitem.cxx | 7 | ||||
| -rw-r--r-- | editeng/source/rtf/svxrtf.cxx | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx index 6675edba5380..023a12f5d20d 100644 --- a/editeng/source/rtf/rtfitem.cxx +++ b/editeng/source/rtf/rtfitem.cxx @@ -217,7 +217,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet ) RTF_CharTypeDef eCharType = NOTDEF_CHARTYPE; sal_uInt16 nFontAlign; - int bChkStkPos = !bNewGroup && !aAttrStack.empty(); + bool bChkStkPos = !bNewGroup && !aAttrStack.empty(); while( bContinue && IsParserWorking() ) // as long as known Attribute are recognized { @@ -1403,7 +1403,8 @@ void SvxRTFParser::ReadBorderAttr( int nToken, SfxItemSet& rSet, aAttr = *(SvxBoxItem*)pItem; SvxBorderLine aBrd( 0, DEF_LINE_WIDTH_0 ); // Simple plain line - int bContinue = sal_True, nBorderTyp = 0; + bool bContinue = true; + int nBorderTyp = 0; long nWidth = 1; bool bDoubleWidth = false; @@ -1585,7 +1586,7 @@ void SvxRTFParser::ReadBackgroundAttr( int nToken, SfxItemSet& rSet, int bTableDef ) { // then read the border attribute - int bContinue = sal_True; + bool bContinue = true; sal_uInt16 nColor = USHRT_MAX, nFillColor = USHRT_MAX; sal_uInt8 nFillValue = 0; diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx index 0331be70aa66..cdd6fe81b51e 100644 --- a/editeng/source/rtf/svxrtf.cxx +++ b/editeng/source/rtf/svxrtf.cxx @@ -925,7 +925,7 @@ void SvxRTFParser::AttrGroupEnd() // process the current, delete from Stack } // Set all attributes which have been defined from start until here - int bCrsrBack = !pInsPos->GetCntIdx(); + bool bCrsrBack = !pInsPos->GetCntIdx(); if( bCrsrBack ) { // at the beginning of a paragraph? Move back one position @@ -1025,7 +1025,7 @@ void SvxRTFParser::AttrGroupEnd() // process the current, delete from Stack { // at the beginning of a paragraph? Move back one position MovePos( sal_True ); - bCrsrBack = sal_False; + bCrsrBack = false; // Open a new Group. SvxRTFItemStackType* pNew = new SvxRTFItemStackType( @@ -1094,7 +1094,7 @@ void SvxRTFParser::SetAttrSet( SvxRTFItemStackType &rSet ) } // Has no Text been inserted yet? (SttPos from the top Stack entry!) -int SvxRTFParser::IsAttrSttPos() +bool SvxRTFParser::IsAttrSttPos() { SvxRTFItemStackType* pAkt = aAttrStack.empty() ? 0 : aAttrStack.back(); return !pAkt || (pAkt->pSttNd->GetIdx() == pInsPos->GetNodeIdx() && |