diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2012-12-17 18:12:09 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2012-12-17 19:12:27 +0900 |
commit | 2bbb4b9c5bf9c61c5b0b7fdfcce5b97e04a63a8a (patch) | |
tree | b9009165d81e91480c4aae8845364928335f11d0 | |
parent | 5af4fff6d4dede7e60d407766f30e7191eeeee66 (diff) |
sal_Bool to bool
Change-Id: I8fe2b267454a3a4c235e6de7f44aa127657d0429
-rw-r--r-- | sw/source/core/unocore/unostyle.cxx | 66 | ||||
-rw-r--r-- | sw/source/core/unocore/unotbl.cxx | 40 | ||||
-rw-r--r-- | sw/source/core/unocore/unotext.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/view/vdraw.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/view/viewsh.cxx | 20 |
5 files changed, 67 insertions, 67 deletions
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index e6f5abf2d1d6..a1995e4c1f69 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -1390,7 +1390,7 @@ void SwXStyle::setName(const OUString& rName) throw( uno::RuntimeException ) pBasePool->SetSearchMask(eFamily, SFXSTYLEBIT_ALL ); SfxStyleSheetBase* pBase = pBasePool->Find(sStyleName); OSL_ENSURE(pBase, "where is the style?" ); - sal_Bool bExcept = sal_True; + bool bExcept = true; if(pBase && pBase->IsUserDefined()) { rtl::Reference< SwDocStyleSheet > xTmp( new SwDocStyleSheet( *(SwDocStyleSheet*)pBase ) ); @@ -1466,7 +1466,7 @@ void SwXStyle::setParentStyle(const OUString& rParentStyle) if(pBasePool) { pBasePool->SetSearchMask(eFamily); - sal_Bool bExcept = sal_False; + bool bExcept = false; SfxStyleSheetBase* pBase = pBasePool->Find(sStyleName); if(pBase) { @@ -1479,7 +1479,7 @@ void SwXStyle::setParentStyle(const OUString& rParentStyle) } } else - bExcept = sal_True; + bExcept = true; if(bExcept) throw uno::RuntimeException(); } @@ -2411,11 +2411,11 @@ uno::Sequence< uno::Any > SAL_CALL SwXStyle::GetPropertyValues_Impl( pPropImpl->GetProperty ( pNames[nProp], pAny ); if( !pAny ) { - sal_Bool bExcept = sal_False; + bool bExcept = false; switch( eFamily ) { case SFX_STYLE_FAMILY_PSEUDO: - bExcept = sal_True; + bExcept = true; break; case SFX_STYLE_FAMILY_PARA: case SFX_STYLE_FAMILY_PAGE: @@ -2436,7 +2436,7 @@ uno::Sequence< uno::Any > SAL_CALL SwXStyle::GetPropertyValues_Impl( rItem.QueryValue ( pRet[nProp], pEntry->nMemberId ); } else - bExcept = sal_True; + bExcept = true; } break; @@ -3069,50 +3069,50 @@ void SAL_CALL SwXPageStyle::SetPropertyValues_Impl( case FN_UNO_FOOTER_HEIGHT: case FN_UNO_FOOTER_EAT_SPACING: { - sal_Bool bFooter = sal_False; + bool bFooter = false; sal_uInt16 nItemType = TYPE_BOOL; sal_uInt16 nRes = 0; switch(pEntry->nWID) { - case FN_UNO_FOOTER_ON: bFooter = sal_True; + case FN_UNO_FOOTER_ON: bFooter = true; //kein break; case FN_UNO_HEADER_ON: nRes = SID_ATTR_PAGE_ON; break; - case FN_UNO_FOOTER_BACKGROUND: bFooter = sal_True; + case FN_UNO_FOOTER_BACKGROUND: bFooter = true; // kein break; case FN_UNO_HEADER_BACKGROUND: nRes = RES_BACKGROUND; nItemType = TYPE_BRUSH; break; - case FN_UNO_FOOTER_BOX: bFooter = sal_True; + case FN_UNO_FOOTER_BOX: bFooter = true; // kein break; case FN_UNO_HEADER_BOX: nRes = RES_BOX; nItemType = TYPE_BOX; break; - case FN_UNO_FOOTER_LR_SPACE: bFooter = sal_True; + case FN_UNO_FOOTER_LR_SPACE: bFooter = true; // kein break; case FN_UNO_HEADER_LR_SPACE: nRes = RES_LR_SPACE;nItemType = TYPE_LRSPACE; break; - case FN_UNO_FOOTER_SHADOW: bFooter = sal_True; + case FN_UNO_FOOTER_SHADOW: bFooter = true; // kein break; case FN_UNO_HEADER_SHADOW: nRes = RES_SHADOW;nItemType = TYPE_SHADOW; break; - case FN_UNO_FOOTER_BODY_DISTANCE: bFooter = sal_True; + case FN_UNO_FOOTER_BODY_DISTANCE: bFooter = true; // kein break; case FN_UNO_HEADER_BODY_DISTANCE: nRes = RES_UL_SPACE;nItemType = TYPE_ULSPACE; break; - case FN_UNO_FOOTER_IS_DYNAMIC_DISTANCE: bFooter = sal_True; + case FN_UNO_FOOTER_IS_DYNAMIC_DISTANCE: bFooter = true; // kein break; case FN_UNO_HEADER_IS_DYNAMIC_DISTANCE: nRes = SID_ATTR_PAGE_DYNAMIC; break; - case FN_UNO_FOOTER_SHARE_CONTENT: bFooter = sal_True; + case FN_UNO_FOOTER_SHARE_CONTENT: bFooter = true; // kein break; case FN_UNO_HEADER_SHARE_CONTENT: nRes = SID_ATTR_PAGE_SHARED; break; case FN_UNO_FIRST_SHARE_CONTENT: nRes = SID_ATTR_PAGE_SHARED_FIRST; break; - case FN_UNO_FOOTER_HEIGHT: bFooter = sal_True; + case FN_UNO_FOOTER_HEIGHT: bFooter = true; // kein break; case FN_UNO_HEADER_HEIGHT: nRes = SID_ATTR_PAGE_SIZE;nItemType = TYPE_SIZE; break; - case FN_UNO_FOOTER_EAT_SPACING: bFooter = sal_True; + case FN_UNO_FOOTER_EAT_SPACING: bFooter = true; // kein break; case FN_UNO_HEADER_EAT_SPACING: nRes = RES_HEADER_FOOTER_EAT_SPACING;nItemType = TYPE_SIZE; break; @@ -3286,7 +3286,7 @@ uno::Sequence< uno::Any > SAL_CALL SwXPageStyle::GetPropertyValues_Impl( } sal_uInt16 nRes = 0; bool bHeader = false; - sal_Bool bLeft = sal_False; + bool bLeft = false; bool bFirst = false; switch(pEntry->nWID) { @@ -3321,11 +3321,11 @@ uno::Sequence< uno::Any > SAL_CALL SwXPageStyle::GetPropertyValues_Impl( { rtl::Reference< SwDocStyleSheet > xStyle( new SwDocStyleSheet( *(SwDocStyleSheet*)pBase ) ); const SfxItemSet& rSet = xStyle->GetItemSet(); - sal_Bool bFooter = sal_False; + bool bFooter = false; switch(pEntry->nWID) { case FN_UNO_FOOTER_ON: - bFooter = sal_True; + bFooter = true; // kein break! case FN_UNO_HEADER_ON: { @@ -3335,41 +3335,41 @@ uno::Sequence< uno::Any > SAL_CALL SwXPageStyle::GetPropertyValues_Impl( nRes = SID_ATTR_PAGE_ON; } break; - case FN_UNO_FOOTER_BACKGROUND: bFooter = sal_True; + case FN_UNO_FOOTER_BACKGROUND: bFooter = true; // kein break; case FN_UNO_HEADER_BACKGROUND: nRes = RES_BACKGROUND; break; - case FN_UNO_FOOTER_BOX: bFooter = sal_True; + case FN_UNO_FOOTER_BOX: bFooter = true; // kein break; case FN_UNO_HEADER_BOX: nRes = RES_BOX; break; - case FN_UNO_FOOTER_LR_SPACE: bFooter = sal_True; + case FN_UNO_FOOTER_LR_SPACE: bFooter = true; // kein break; case FN_UNO_HEADER_LR_SPACE: nRes = RES_LR_SPACE; break; - case FN_UNO_FOOTER_SHADOW: bFooter = sal_True; + case FN_UNO_FOOTER_SHADOW: bFooter = true; // kein break; case FN_UNO_HEADER_SHADOW: nRes = RES_SHADOW; break; - case FN_UNO_FOOTER_BODY_DISTANCE: bFooter = sal_True; + case FN_UNO_FOOTER_BODY_DISTANCE: bFooter = true; // kein break; case FN_UNO_HEADER_BODY_DISTANCE: nRes = RES_UL_SPACE; break; - case FN_UNO_FOOTER_IS_DYNAMIC_DISTANCE: bFooter = sal_True; + case FN_UNO_FOOTER_IS_DYNAMIC_DISTANCE: bFooter = true; // kein break; case FN_UNO_HEADER_IS_DYNAMIC_DISTANCE: nRes = SID_ATTR_PAGE_DYNAMIC; break; - case FN_UNO_FOOTER_SHARE_CONTENT: bFooter = sal_True; + case FN_UNO_FOOTER_SHARE_CONTENT: bFooter = true; // kein break; case FN_UNO_HEADER_SHARE_CONTENT: nRes = SID_ATTR_PAGE_SHARED; break; case FN_UNO_FIRST_SHARE_CONTENT: nRes = SID_ATTR_PAGE_SHARED_FIRST; break; - case FN_UNO_FOOTER_HEIGHT: bFooter = sal_True; + case FN_UNO_FOOTER_HEIGHT: bFooter = true; // kein break; case FN_UNO_HEADER_HEIGHT: nRes = SID_ATTR_PAGE_SIZE; break; - case FN_UNO_FOOTER_EAT_SPACING: bFooter = sal_True; + case FN_UNO_FOOTER_EAT_SPACING: bFooter = true; // kein break; case FN_UNO_HEADER_EAT_SPACING: nRes = RES_HEADER_FOOTER_EAT_SPACING; break; @@ -3393,7 +3393,7 @@ uno::Sequence< uno::Any > SAL_CALL SwXPageStyle::GetPropertyValues_Impl( case FN_UNO_HEADER : goto Header; case FN_UNO_HEADER_LEFT : - bLeft = sal_True; goto Header; + bLeft = true; goto Header; case FN_UNO_HEADER_FIRST : bFirst = true; goto Header; case FN_UNO_HEADER_RIGHT : @@ -3404,9 +3404,9 @@ Header: case FN_UNO_FOOTER : goto Footer; case FN_UNO_FOOTER_LEFT : - bLeft = sal_True; goto Footer; + bLeft = true; goto Footer; case FN_UNO_FOOTER_FIRST : - bFirst = sal_True; goto Footer; + bFirst = true; goto Footer; case FN_UNO_FOOTER_RIGHT : Footer: nRes = RES_FOOTER; @@ -3414,7 +3414,7 @@ MakeObject: { const SwPageDesc& rDesc = aBase.GetOldPageDesc(); const SwFrmFmt* pFrmFmt = 0; - sal_Bool bShare = (bHeader && rDesc.IsHeaderShared())|| + bool bShare = (bHeader && rDesc.IsHeaderShared())|| (!bHeader && rDesc.IsFooterShared()); bool bShareFirst = rDesc.IsFirstShared(); // TextLeft returns the left content if there is one, diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index c602c2577b96..c54e951d9171 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -106,7 +106,7 @@ extern void sw_GetTblBoxColStr( sal_uInt16 nCol, String& rNm ); #define UNO_TABLE_COLUMN_SUM 10000 -static sal_Bool lcl_LineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSvxLine) +static bool lcl_LineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSvxLine) { rSvxLine.SetColor(Color(rLine.Color)); @@ -115,7 +115,7 @@ static sal_Bool lcl_LineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& MM100_TO_TWIP( rLine.InnerLineWidth ), MM100_TO_TWIP( rLine.LineDistance ) ); - sal_Bool bRet = rLine.InnerLineWidth > 0 || rLine.OuterLineWidth > 0; + bool bRet = rLine.InnerLineWidth > 0 || rLine.OuterLineWidth > 0; return bRet; } @@ -596,14 +596,14 @@ static void lcl_GetTblSeparators(uno::Any& rRet, SwTable* pTable, SwTableBox* pB sal_uInt16 nSepCount = aCols.Count(); uno::Sequence< text::TableColumnSeparator> aColSeq(nSepCount); text::TableColumnSeparator* pArray = aColSeq.getArray(); - sal_Bool bError = sal_False; + bool bError = false; for(sal_uInt16 i = 0; i < nSepCount; i++) { pArray[i].Position = static_cast< sal_Int16 >(aCols[i]); pArray[i].IsVisible = !aCols.IsHidden(i); if(!bRow && !pArray[i].IsVisible) { - bError = sal_True; + bError = true; break; } } @@ -1961,7 +1961,7 @@ void SwTableProperties_Impl::ApplyTblAttr(const SwTable& rTbl, SwDoc& rDoc) aSet.Put(aBrush); } - sal_Bool bPutBreak = sal_True; + bool bPutBreak = true; const uno::Any* pPage; if(GetProperty(FN_UNO_PAGE_STYLE, 0, pPage) || GetProperty(RES_PAGEDESC, 0xff, pPage)) { @@ -1983,7 +1983,7 @@ void SwTableProperties_Impl::ApplyTblAttr(const SwTable& rTbl, SwDoc& rDoc) aDesc.SetNumOffset( nTmp ); } aSet.Put(aDesc); - bPutBreak = sal_False; + bPutBreak = false; } } @@ -2025,18 +2025,18 @@ void SwTableProperties_Impl::ApplyTblAttr(const SwTable& rTbl, SwDoc& rDoc) const uno::Any* pWidth = 0; GetProperty(FN_TABLE_WIDTH, 0xff, pWidth ); - sal_Bool bPutSize = pWidth != 0; + bool bPutSize = pWidth != 0; SwFmtFrmSize aSz( ATT_VAR_SIZE); if(pWidth) { ((SfxPoolItem&)aSz).PutValue(*pWidth, MID_FRMSIZE_WIDTH); - bPutSize = sal_True; + bPutSize = true; } sal_Bool bTemp = pSzRel ? *(sal_Bool*)pSzRel->getValue() : sal_False; if(pSzRel && bTemp && pRelWidth) { ((SfxPoolItem&)aSz).PutValue(*pRelWidth, MID_FRMSIZE_REL_WIDTH|CONVERT_TWIPS); - bPutSize = sal_True; + bPutSize = true; } if(bPutSize) { @@ -2545,7 +2545,7 @@ uno::Sequence< uno::Sequence< uno::Any > > SAL_CALL SwXTextTable::getDataArray() { // check if table box value item is set SwFrmFmt* pBoxFmt = pBox->GetFrmFmt(); - sal_Bool bIsNum = pBoxFmt->GetItemState( RES_BOXATR_VALUE, sal_False ) == SFX_ITEM_SET; + bool bIsNum = pBoxFmt->GetItemState( RES_BOXATR_VALUE, sal_False ) == SFX_ITEM_SET; //const SfxPoolItem* pItem; //SwDoc* pDoc = pXCell->GetDoc(); //sal_Bool bIsText = (SFX_ITEM_SET != pBoxFmt->GetAttrSet().GetItemState(RES_BOXATR_FORMAT, sal_True, &pItem) @@ -2682,7 +2682,7 @@ void SwXTextTable::setData(const uno::Sequence< uno::Sequence< double > >& rData SolarMutexGuard aGuard; sal_Int16 nRowCount = getRowCount(); sal_Int16 nColCount = getColumnCount(); - sal_Bool bChanged = sal_False; + bool bChanged = false; if(!nRowCount || !nColCount) { @@ -2716,7 +2716,7 @@ void SwXTextTable::setData(const uno::Sequence< uno::Sequence< double > >& rData throw uno::RuntimeException(); } xCell->setValue(pColArray[nCol - nColStart]); - bChanged=sal_True; + bChanged=true; } } if ( bChanged ) @@ -3512,7 +3512,7 @@ void SwXTextTable::setName(const OUString& rName) throw( uno::RuntimeException ) if(pFmt) { const String aOldName( pFmt->GetName() ); - sal_Bool bNameFound = sal_False; + bool bNameFound = false; SwFrmFmt* pTmpFmt; const SwFrmFmts* pTbl = pFmt->GetDoc()->GetTblFrmFmts(); for( sal_uInt16 i = pTbl->size(); i; ) @@ -3520,7 +3520,7 @@ void SwXTextTable::setName(const OUString& rName) throw( uno::RuntimeException ) pTmpFmt->GetName() == sNewTblName && pFmt->GetDoc()->IsUsed( *pTmpFmt )) { - bNameFound = sal_True; + bNameFound = true; break; } @@ -4094,7 +4094,7 @@ void SwXCellRange::GetDataSequence( if (pAnyData) { // check if table box value item is set - sal_Bool bIsNum = pBox->GetFrmFmt()->GetItemState( RES_BOXATR_VALUE, sal_False ) == SFX_ITEM_SET; + bool bIsNum = pBox->GetFrmFmt()->GetItemState( RES_BOXATR_VALUE, sal_False ) == SFX_ITEM_SET; //sal_uLong nNdPos = pBox->IsValidNumTxtNd( sal_True ); if (!bIsNum/* && ULONG_MAX == nNdPos*/) pAnyData[nDtaCnt++] <<= lcl_getString(*pXCell); @@ -4214,7 +4214,7 @@ uno::Sequence< uno::Sequence< uno::Any > > SAL_CALL SwXCellRange::getDataArray() { // check if table box value item is set SwFrmFmt* pBoxFmt = pBox->GetFrmFmt(); - sal_Bool bIsNum = pBoxFmt->GetItemState( RES_BOXATR_VALUE, sal_False ) == SFX_ITEM_SET; + bool bIsNum = pBoxFmt->GetItemState( RES_BOXATR_VALUE, sal_False ) == SFX_ITEM_SET; //const SfxPoolItem* pItem; //SwDoc* pDoc = pXCell->GetDoc(); //sal_Bool bIsText = (SFX_ITEM_SET != pBoxFmt->GetAttrSet().GetItemState(RES_BOXATR_FORMAT, sal_True, &pItem) @@ -4773,7 +4773,7 @@ void SwXTableRows::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( uno: throw uno::RuntimeException(); else { - sal_Bool bSuccess = sal_False; + bool bSuccess = false; SwTable* pTable = SwTable::FindTable( pFrmFmt ); if(!pTable->IsTblComplex()) { @@ -4805,7 +4805,7 @@ void SwXTableRows::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( uno: UnoActionContext aAction(pFrmFmt->GetDoc()); pFrmFmt->GetDoc()->DeleteRow(*pUnoCrsr); delete pUnoCrsr; - bSuccess = sal_True; + bSuccess = true; } { // hier muessen die Actions aufgehoben werden @@ -4982,7 +4982,7 @@ void SwXTableColumns::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( u throw uno::RuntimeException(); else { - sal_Bool bSuccess = sal_False; + bool bSuccess = false; SwTable* pTable = SwTable::FindTable( pFrmFmt ); if(!pTable->IsTblComplex()) { @@ -5014,7 +5014,7 @@ void SwXTableColumns::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( u UnoActionContext aAction(pFrmFmt->GetDoc()); pFrmFmt->GetDoc()->DeleteCol(*pUnoCrsr); delete pUnoCrsr; - bSuccess = sal_True; + bSuccess = true; } { // hier muessen die Actions aufgehoben werden diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index ebc9de006817..0515b3ce7a1b 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -948,7 +948,7 @@ SwXText::setString(const OUString& rString) throw (uno::RuntimeException) //the inserting of nodes should only be done if really necessary //to prevent #97924# (removes paragraph attributes when setting the text //e.g. of a table cell - sal_Bool bInsertNodes = sal_False; + bool bInsertNodes = false; SwNodeIndex aStartIdx(*pStartNode); do { @@ -957,7 +957,7 @@ SwXText::setString(const OUString& rString) throw (uno::RuntimeException) if(rCurrentNode.GetNodeType() == ND_SECTIONNODE ||rCurrentNode.GetNodeType() == ND_TABLENODE) { - bInsertNodes = sal_True; + bInsertNodes = true; break; } } diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx index 3c331cc15cb1..7b5009bdfc48 100644 --- a/sw/source/core/view/vdraw.cxx +++ b/sw/source/core/view/vdraw.cxx @@ -200,11 +200,11 @@ void SwViewImp::NotifySizeChg( const Size &rNewSz ) // Limitation of the work area const Rectangle aRect( Point( DOCUMENTBORDER, DOCUMENTBORDER ), rNewSz ); const Rectangle &rOldWork = GetDrawView()->GetWorkArea(); - sal_Bool bCheckDrawObjs = sal_False; + bool bCheckDrawObjs = false; if ( aRect != rOldWork ) { if ( rOldWork.Bottom() > aRect.Bottom() || rOldWork.Right() > aRect.Right()) - bCheckDrawObjs = sal_True; + bCheckDrawObjs = true; GetDrawView()->SetWorkArea( aRect ); } if ( !bCheckDrawObjs ) diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index e50adf973213..883cb77206c8 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -77,7 +77,7 @@ Window *ViewShell::pCareWindow = 0; BitmapEx* ViewShell::pErrorBmp = NULL; BitmapEx* ViewShell::pReplaceBmp = NULL; -sal_Bool bInSizeNotify = sal_False; +bool bInSizeNotify = false; DBG_NAME(LayoutIdle) @@ -269,7 +269,7 @@ void ViewShell::ImplEndAction( const sal_Bool bIdleEnd ) // Mitte eine Selektion und mit einem anderen Cursor an linken // rechten Rand springen. Ohne ShowCrsr verschwindet die // Selektion - sal_Bool bShowCrsr = pRegion && IsA( TYPE(SwCrsrShell) ); + bool bShowCrsr = pRegion && IsA( TYPE(SwCrsrShell) ); if( bShowCrsr ) ((SwCrsrShell*)this)->HideCrsrs(); @@ -290,7 +290,7 @@ void ViewShell::ImplEndAction( const sal_Bool bIdleEnd ) SwRect aRect( pRegion->back() ); pRegion->pop_back(); - sal_Bool bPaint = sal_True; + bool bPaint = true; if ( IsEndActionByVirDev() ) { //virtuelles device erzeugen und einstellen. @@ -321,7 +321,7 @@ void ViewShell::ImplEndAction( const sal_Bool bIdleEnd ) } if ( bSizeOK ) { - bPaint = sal_False; + bPaint = false; // --> OD 2007-07-26 #i79947# // #i72754# start Pre/PostPaint encapsulation before pOut is changed to the buffering VDev @@ -942,7 +942,7 @@ void ViewShell::CalcLayout() SwTxtFrm::GetTxtCache()->GetCurMax() - 50 ); //Progress einschalten wenn noch keiner Lauft. - const sal_Bool bEndProgress = SfxProgress::GetActiveProgress( GetDoc()->GetDocShell() ) == 0; + const bool bEndProgress = SfxProgress::GetActiveProgress( GetDoc()->GetDocShell() ) == 0; if ( bEndProgress ) { sal_uInt16 nEndPage = GetLayout()->GetPageNum(); @@ -1455,7 +1455,7 @@ void ViewShell::PaintDesktop( const SwRect &rRect ) //Kann z.B. waehrend des Idle'ns zwischenzeitlich auftreten. //Die Rechtecke neben den Seiten muessen wir leider auf jedenfall Painten, //den diese werden spaeter beim VisPortChgd ausgespart. - sal_Bool bBorderOnly = sal_False; + bool bBorderOnly = false; const SwRootFrm *pRoot = GetLayout();//swmod 080305 if ( rRect.Top() > pRoot->Frm().Bottom() ) { @@ -1463,7 +1463,7 @@ void ViewShell::PaintDesktop( const SwRect &rRect ) while ( pPg && pPg->GetNext() ) pPg = pPg->GetNext(); if ( !pPg || !pPg->Frm().IsOver( VisArea() ) ) - bBorderOnly = sal_True; + bBorderOnly = true; } const bool bBookMode = GetViewOptions()->IsViewLayoutBookMode(); @@ -2098,7 +2098,7 @@ void ViewShell::ImplApplyViewOptions( const SwViewOption &rOpt ) pDView->SetMarkHdlSizePixel(9); } - sal_Bool bOnlineSpellChgd = pOpt->IsOnlineSpell() != rOpt.IsOnlineSpell(); + bool bOnlineSpellChgd = pOpt->IsOnlineSpell() != rOpt.IsOnlineSpell(); *pOpt = rOpt; // Erst jetzt werden die Options uebernommen. pOpt->SetUIOptions(rOpt); @@ -2213,8 +2213,8 @@ void ViewShell::UISizeNotify() if ( bDocSizeChgd ) { bDocSizeChgd = sal_False; - sal_Bool bOld = bInSizeNotify; - bInSizeNotify = sal_True; + bool bOld = bInSizeNotify; + bInSizeNotify = true; ::SizeNotify( this, GetDocSize() ); bInSizeNotify = bOld; } |