diff options
author | Noel Grandin <noel@peralex.com> | 2014-04-25 14:00:35 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-04-30 08:44:42 +0200 |
commit | 6aa35db39311dcd7965c9c9c21fcf4143a1f9b43 (patch) | |
tree | 04320eaf8c7481c1b496460624ee20ec11360ac2 /sw/source/core/draw | |
parent | 1417061d1b2c110e7e690523a544b58e7ffd05c0 (diff) |
sw: sal_Bool->bool
Change-Id: I324a0ffde2ddcca105451c19e7aadcfad15211d8
Diffstat (limited to 'sw/source/core/draw')
-rw-r--r-- | sw/source/core/draw/dcontact.cxx | 18 | ||||
-rw-r--r-- | sw/source/core/draw/dflyobj.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/draw/dpage.cxx | 10 | ||||
-rw-r--r-- | sw/source/core/draw/dview.cxx | 20 |
4 files changed, 25 insertions, 25 deletions
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index 8467814d3dd9..7abc1f83bfed 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -112,7 +112,7 @@ SwFrmFmt *FindFrmFmt( SdrObject *pObj ) return pRetval; } -sal_Bool HasWrap( const SdrObject* pObj ) +bool HasWrap( const SdrObject* pObj ) { if ( pObj ) { @@ -123,7 +123,7 @@ sal_Bool HasWrap( const SdrObject* pObj ) } } - return sal_False; + return false; } /// returns the BoundRect _inclusive_ distance of the object. @@ -155,7 +155,7 @@ SwContact* GetUserCall( const SdrObject* pObj ) } /// Returns sal_True if the SrdObject is a Marquee-Object (scrolling text) -sal_Bool IsMarqueeTextObj( const SdrObject& rObj ) +bool IsMarqueeTextObj( const SdrObject& rObj ) { SdrTextAniKind eTKind; return SdrInventor == rObj.GetObjInventor() && @@ -209,7 +209,7 @@ void SwContact::MoveObjToVisibleLayer( SdrObject* _pDrawObj ) if ( pAnchoredObj->GetPageFrm() ) { ::Notify_Background( _pDrawObj, pAnchoredObj->GetPageFrm(), - pAnchoredObj->GetObjRect(), PREP_FLY_ARRIVE, sal_True ); + pAnchoredObj->GetObjRect(), PREP_FLY_ARRIVE, true ); } pAnchoredObj->InvalidateObjPos(); @@ -236,7 +236,7 @@ void SwContact::MoveObjToInvisibleLayer( SdrObject* _pDrawObj ) if ( pAnchoredObj && pAnchoredObj->GetPageFrm() ) { ::Notify_Background( _pDrawObj, pAnchoredObj->GetPageFrm(), - pAnchoredObj->GetObjRect(), PREP_FLY_LEAVE, sal_True ); + pAnchoredObj->GetObjRect(), PREP_FLY_LEAVE, true ); } } } @@ -988,7 +988,7 @@ void SwDrawContact::NotifyBackgrdOfAllVirtObjs( const Rectangle* pOldBoundRect ) aOldRect.Pos() += pDrawVirtObj->GetOffset(); if( aOldRect.HasArea() ) ::Notify_Background( pDrawVirtObj, pPage, - aOldRect, PREP_FLY_LEAVE,sal_True); + aOldRect, PREP_FLY_LEAVE,true); } // #i34640# - include spacing for wrapping SwRect aRect( pDrawVirtObj->GetAnchoredObj()->GetObjRectWithSpaces() ); @@ -997,7 +997,7 @@ void SwDrawContact::NotifyBackgrdOfAllVirtObjs( const Rectangle* pOldBoundRect ) SwPageFrm* pPg = (SwPageFrm*)::FindPage( aRect, pPage ); if ( pPg ) ::Notify_Background( pDrawVirtObj, pPg, aRect, - PREP_FLY_ARRIVE, sal_True ); + PREP_FLY_ARRIVE, true ); } ::ClrContourCache( pDrawVirtObj ); } @@ -1024,7 +1024,7 @@ static void lcl_NotifyBackgroundOfObj( SwDrawContact& _rDrawContact, // #i34640# - determine correct page frame SwPageFrm* pOldPageFrm = (SwPageFrm*)::FindPage( aOldRect, pPageFrm ); ::Notify_Background( &_rObj, pOldPageFrm, aOldRect, - PREP_FLY_LEAVE, sal_True); + PREP_FLY_LEAVE, true); } } // #i34640# - include spacing for wrapping @@ -1033,7 +1033,7 @@ static void lcl_NotifyBackgroundOfObj( SwDrawContact& _rDrawContact, { pPageFrm = (SwPageFrm*)::FindPage( aNewRect, pPageFrm ); ::Notify_Background( &_rObj, pPageFrm, aNewRect, - PREP_FLY_ARRIVE, sal_True ); + PREP_FLY_ARRIVE, true ); } ClrContourCache( &_rObj ); } diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index 7c190ead3e6b..c7b57fe5f519 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -735,7 +735,7 @@ void SwVirtFlyDrawObj::NbcResize(const Point& rRef, pTmpFrm = GetFlyFrm(); const bool bVertX = pTmpFrm->IsVertical(); - const sal_Bool bRTL = pTmpFrm->IsRightToLeft(); + const bool bRTL = pTmpFrm->IsRightToLeft(); const bool bVertL2RX = pTmpFrm->IsVertLR(); const Point aNewPos( ( bVertX && !bVertL2RX ) || bRTL ? diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx index 51c4a3c44d56..64692a8d6f0c 100644 --- a/sw/source/core/draw/dpage.cxx +++ b/sw/source/core/draw/dpage.cxx @@ -48,7 +48,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::frame; -SwDPage::SwDPage(SwDrawDocument& rNewModel, sal_Bool bMasterPage) : +SwDPage::SwDPage(SwDrawDocument& rNewModel, bool bMasterPage) : FmFormPage(rNewModel, bMasterPage), pGridLst( 0 ), rDoc(rNewModel.GetDoc()) @@ -121,10 +121,10 @@ const SdrPageGridFrameList* SwDPage::GetGridFrameList( return pGridLst; } -sal_Bool SwDPage::RequestHelp( Window* pWindow, SdrView* pView, +bool SwDPage::RequestHelp( Window* pWindow, SdrView* pView, const HelpEvent& rEvt ) { - sal_Bool bContinue = sal_True; + bool bContinue = true; if( rEvt.GetMode() & ( HELPMODE_QUICK | HELPMODE_BALLOON )) { @@ -175,7 +175,7 @@ sal_Bool SwDPage::RequestHelp( Window* pWindow, SdrView* pView, if ( !sTxt.isEmpty() ) { // #i80029# - sal_Bool bExecHyperlinks = rDoc.GetDocShell()->IsReadOnly(); + bool bExecHyperlinks = rDoc.GetDocShell()->IsReadOnly(); if ( !bExecHyperlinks ) { SvtSecurityOptions aSecOpts; @@ -197,7 +197,7 @@ sal_Bool SwDPage::RequestHelp( Window* pWindow, SdrView* pView, Rectangle aRect( rEvt.GetMousePosPixel(), Size(1,1) ); Help::ShowQuickHelp( pWindow, aRect, sTxt ); } - bContinue = sal_False; + bContinue = false; } } } diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx index a1b4eea820ae..09b8acf329b7 100644 --- a/sw/source/core/draw/dview.cxx +++ b/sw/source/core/draw/dview.cxx @@ -71,7 +71,7 @@ bool SwSdrHdl::IsFocusHdl() const return SdrHdl::IsFocusHdl(); } -static const SwFrm *lcl_FindAnchor( const SdrObject *pObj, sal_Bool bAll ) +static const SwFrm *lcl_FindAnchor( const SdrObject *pObj, bool bAll ) { const SwVirtFlyDrawObj *pVirt = pObj->ISA(SwVirtFlyDrawObj) ? (SwVirtFlyDrawObj*)pObj : 0; @@ -120,7 +120,7 @@ SwDrawView::SwDrawView( SwViewImp &rI, SdrModel *pMd, OutputDevice *pOutDev) : } // #i99665# -sal_Bool SwDrawView::IsAntiAliasing() const +bool SwDrawView::IsAntiAliasing() const { return getOptionsDrawinglayer().IsAntiAliasing(); } @@ -246,7 +246,7 @@ SdrObject* SwDrawView::GetMaxToTopObj( SdrObject* pObj ) const { if ( GetUserCall(pObj) ) { - const SwFrm *pAnch = ::lcl_FindAnchor( pObj, sal_False ); + const SwFrm *pAnch = ::lcl_FindAnchor( pObj, false ); if ( pAnch ) { //The topmost Obj within the anchor must not be overtaken. @@ -264,7 +264,7 @@ SdrObject* SwDrawView::GetMaxToTopObj( SdrObject* pObj ) const if ( pO->GetOrdNumDirect() > nOrdNum ) { - const SwFrm *pTmpAnch = ::lcl_FindAnchor( pO, sal_False ); + const SwFrm *pTmpAnch = ::lcl_FindAnchor( pO, false ); if ( pFly->IsAnLower( pTmpAnch ) ) { nOrdNum = pO->GetOrdNumDirect(); @@ -291,7 +291,7 @@ SdrObject* SwDrawView::GetMaxToBtmObj(SdrObject* pObj) const { if ( GetUserCall(pObj) ) { - const SwFrm *pAnch = ::lcl_FindAnchor( pObj, sal_False ); + const SwFrm *pAnch = ::lcl_FindAnchor( pObj, false ); if ( pAnch ) { //The Fly of the anchor must not be "flying under". @@ -328,7 +328,7 @@ sal_uInt32 SwDrawView::_GetMaxChildOrdNum( const SwFlyFrm& _rParentObj, } if ( pObj->GetOrdNum() > nMaxChildOrdNum && - _rParentObj.IsAnLower( lcl_FindAnchor( pObj, sal_True ) ) ) + _rParentObj.IsAnLower( lcl_FindAnchor( pObj, true ) ) ) { nMaxChildOrdNum = pObj->GetOrdNum(); break; @@ -547,7 +547,7 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos, // If object is anchored inside a invisible part of the document // (e.g. page header, whose page style isn't applied, or hidden // section), no anchor frame exists. - const SwFrm* pTmpAnchorFrm = lcl_FindAnchor( pTmpObj, sal_True ); + const SwFrm* pTmpAnchorFrm = lcl_FindAnchor( pTmpObj, true ); const SwFlyFrm* pTmpParentObj = pTmpAnchorFrm ? pTmpAnchorFrm->FindFlyFrm() : 0L; if ( pTmpParentObj && @@ -600,7 +600,7 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos, // If object is anchored inside a invisible part of the document // (e.g. page header, whose page style isn't applied, or hidden // section), no anchor frame exists. - const SwFrm* pTmpAnchorFrm = lcl_FindAnchor( pTmpObj, sal_True ); + const SwFrm* pTmpAnchorFrm = lcl_FindAnchor( pTmpObj, true ); const SwFlyFrm* pTmpParentObj = pTmpAnchorFrm ? pTmpAnchorFrm->FindFlyFrm() : 0L; if ( pTmpParentObj && @@ -678,7 +678,7 @@ const SwFrm* SwDrawView::CalcAnchor() //current anchor. Search only if we currently drag. const SwFrm* pAnch; Rectangle aMyRect; - const sal_Bool bFly = pObj->ISA(SwVirtFlyDrawObj); + const bool bFly = pObj->ISA(SwVirtFlyDrawObj); if ( bFly ) { pAnch = ((SwVirtFlyDrawObj*)pObj)->GetFlyFrm()->GetAnchorFrm(); @@ -700,7 +700,7 @@ const SwFrm* SwDrawView::CalcAnchor() aMyRect = pObj->GetSnapRect(); } - const sal_Bool bTopRight = pAnch && ( ( pAnch->IsVertical() && + const bool bTopRight = pAnch && ( ( pAnch->IsVertical() && !pAnch->IsVertLR() ) || pAnch->IsRightToLeft() ); const Point aMyPt = bTopRight ? aMyRect.TopRight() : aMyRect.TopLeft(); |