Kaydet (Commit) 4f405d8c authored tarafından Caolán McNamara's avatar Caolán McNamara

OSL_ENSURE -> assert when followed by unconditional dereference

Change-Id: Ic118450e11ca6a4f705670dd71015ff74072fa05
üst 233da237
...@@ -542,7 +542,7 @@ void SwPageFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, ...@@ -542,7 +542,7 @@ void SwPageFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
if( rOldCol != rNewCol ) if( rOldCol != rNewCol )
{ {
SwLayoutFrm *pB = FindBodyCont(); SwLayoutFrm *pB = FindBodyCont();
OSL_ENSURE( pB, "Seite ohne Body." ); assert(pB && "Page without Body.");
pB->ChgColumns( rOldCol, rNewCol ); pB->ChgColumns( rOldCol, rNewCol );
rInvFlags |= 0x20; rInvFlags |= 0x20;
} }
...@@ -948,7 +948,7 @@ void SwPageFrm::PrepareRegisterChg() ...@@ -948,7 +948,7 @@ void SwPageFrm::PrepareRegisterChg()
*/ */
void SwFrm::CheckPageDescs( SwPageFrm *pStart, bool bNotifyFields, SwPageFrm** ppPrev ) void SwFrm::CheckPageDescs( SwPageFrm *pStart, bool bNotifyFields, SwPageFrm** ppPrev )
{ {
OSL_ENSURE( pStart, "no starting page." ); assert(pStart && "no starting page.");
SwViewShell *pSh = pStart->getRootFrm()->GetCurrShell(); SwViewShell *pSh = pStart->getRootFrm()->GetCurrShell();
SwViewImp *pImp = pSh ? pSh->Imp() : 0; SwViewImp *pImp = pSh ? pSh->Imp() : 0;
...@@ -1161,7 +1161,7 @@ SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, bool bFtn ) ...@@ -1161,7 +1161,7 @@ SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, bool bFtn )
if ( !pDesc ) if ( !pDesc )
pDesc = pPrevPage->GetPageDesc()->GetFollow(); pDesc = pPrevPage->GetPageDesc()->GetFollow();
OSL_ENSURE( pDesc, "Missing PageDesc" ); assert(pDesc && "Missing PageDesc");
if( !(bWishedOdd ? pDesc->GetRightFmt() : pDesc->GetLeftFmt()) ) if( !(bWishedOdd ? pDesc->GetRightFmt() : pDesc->GetLeftFmt()) )
bWishedOdd = !bWishedOdd; bWishedOdd = !bWishedOdd;
bool const bWishedFirst = pDesc != pPrevPage->GetPageDesc(); bool const bWishedFirst = pDesc != pPrevPage->GetPageDesc();
...@@ -1865,7 +1865,7 @@ void SwRootFrm::CheckViewLayout( const SwViewOption* pViewOpt, const SwRect* pVi ...@@ -1865,7 +1865,7 @@ void SwRootFrm::CheckViewLayout( const SwViewOption* pViewOpt, const SwRect* pVi
} }
else else
{ {
OSL_ENSURE( pViewOpt, "CheckViewLayout required ViewOptions" ); assert(pViewOpt && "CheckViewLayout required ViewOptions");
const sal_uInt16 nColumns = pViewOpt->GetViewLayoutColumns(); const sal_uInt16 nColumns = pViewOpt->GetViewLayoutColumns();
const bool bBookMode = pViewOpt->IsViewLayoutBookMode(); const bool bBookMode = pViewOpt->IsViewLayoutBookMode();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment