diff options
| author | Caolán McNamara <cmc@openoffice.org> | 2010-07-21 12:04:35 +0100 |
|---|---|---|
| committer | Caolán McNamara <cmc@openoffice.org> | 2010-07-21 12:04:35 +0100 |
| commit | 3cee04ca620a686f4b954a1067ac6c87c88de1d6 (patch) | |
| tree | 9a1de83cd958708833ef66c673917c37a217304f /sw | |
| parent | 12e8f0b1f8b3df82f3c32ed7cb410dbbc43f01e7 (diff) | |
cmcfixes77: #i113327# silence gcc warning
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/layout/findfrm.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx index 8a1e8fe9ea7a..e52fc31fb0b5 100644 --- a/sw/source/core/layout/findfrm.cxx +++ b/sw/source/core/layout/findfrm.cxx @@ -650,9 +650,11 @@ const SwPageFrm* SwRootFrm::GetPageAtPos( const Point& rPt, const Size* pSize, b { const SwRect& rBoundRect = bExtend ? maPageRects[ nPageIdx++ ] : pPage->Frm(); - if ( !pSize && rBoundRect.IsInside( rPt ) || - pSize && rBoundRect.IsOver( aRect ) ) + if ( (!pSize && rBoundRect.IsInside(rPt)) || + (pSize && rBoundRect.IsOver(aRect)) ) + { pRet = static_cast<const SwPageFrm*>(pPage); + } pPage = pPage->GetNext(); } @@ -1719,8 +1721,8 @@ const SwCellFrm& SwCellFrm::FindStartEndOfRowSpanCell( bool bStart, bool bCurren else { if ( pMasterTable == pTableFrm || - ( bStart && pMasterTable->IsAnFollow( pTableFrm ) || - !bStart && pTableFrm->IsAnFollow( pMasterTable ) ) ) + ( (bStart && pMasterTable->IsAnFollow(pTableFrm)) || + (!bStart && pTableFrm->IsAnFollow(pMasterTable)) ) ) { pRet = pMasterCell; break; |