diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:25:48 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:53 +0100 |
commit | 01b49802c7cda7fd4d5ba71263cef7bc95234b89 (patch) | |
tree | b8d92f1c6abf5ac548d0bcb0c581ebfcffd8bfac /sw/source/core/draw | |
parent | 6cd7bf2043146a630925a2e49336f02c802f707a (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I01e11fa956a249974e77dce9deebe79311f098d0
Diffstat (limited to 'sw/source/core/draw')
-rw-r--r-- | sw/source/core/draw/dcontact.cxx | 70 | ||||
-rw-r--r-- | sw/source/core/draw/dflyobj.cxx | 6 | ||||
-rw-r--r-- | sw/source/core/draw/dpage.cxx | 12 | ||||
-rw-r--r-- | sw/source/core/draw/drawdoc.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/draw/dview.cxx | 34 |
5 files changed, 62 insertions, 62 deletions
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index 5f8a77550a74..b0087471967b 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -100,7 +100,7 @@ void setContextWritingMode( SdrObject* pObj, SwFrm* pAnchor ) */ SwFrameFormat *FindFrameFormat( SdrObject *pObj ) { - SwFrameFormat* pRetval = 0L; + SwFrameFormat* pRetval = nullptr; if ( dynamic_cast<const SwVirtFlyDrawObj*>( pObj) != nullptr ) { @@ -152,9 +152,9 @@ SwRect GetBoundRectOfAnchoredObj( const SdrObject* pObj ) SwContact* GetUserCall( const SdrObject* pObj ) { SdrObject *pTmp; - while ( !pObj->GetUserCall() && 0 != (pTmp = pObj->GetUpGroup()) ) + while ( !pObj->GetUserCall() && nullptr != (pTmp = pObj->GetUpGroup()) ) pObj = pTmp; - OSL_ENSURE( !pObj->GetUserCall() || 0 != dynamic_cast< const SwContact*> (pObj->GetUserCall()), + OSL_ENSURE( !pObj->GetUserCall() || nullptr != dynamic_cast< const SwContact*> (pObj->GetUserCall()), "<::GetUserCall(..)> - wrong type of found object user call." ); return static_cast<SwContact*>(pObj->GetUserCall()); } @@ -399,7 +399,7 @@ SwFlyDrawContact::~SwFlyDrawContact() { if ( mpMasterObj ) { - mpMasterObj->SetUserCall( 0 ); + mpMasterObj->SetUserCall( nullptr ); if ( mpMasterObj->GetPage() ) mpMasterObj->GetPage()->RemoveObject( mpMasterObj->GetOrdNum() ); delete mpMasterObj; @@ -416,7 +416,7 @@ const SwAnchoredObject* SwFlyDrawContact::GetAnchoredObj( const SdrObject* _pSdr OSL_ENSURE( GetUserCall( _pSdrObj ) == this, "<SwFlyDrawContact::GetAnchoredObj(..)> - provided object doesn't belongs to this contact" ); - const SwAnchoredObject* pRetAnchoredObj = 0L; + const SwAnchoredObject* pRetAnchoredObj = nullptr; if ( _pSdrObj && dynamic_cast<const SwVirtFlyDrawObj*>( _pSdrObj) != nullptr ) { @@ -435,7 +435,7 @@ SwAnchoredObject* SwFlyDrawContact::GetAnchoredObj( SdrObject* _pSdrObj ) OSL_ENSURE( GetUserCall( _pSdrObj ) == this, "<SwFlyDrawContact::GetAnchoredObj(..)> - provided object doesn't belongs to this contact" ); - SwAnchoredObject* pRetAnchoredObj = 0L; + SwAnchoredObject* pRetAnchoredObj = nullptr; if ( _pSdrObj && dynamic_cast<const SwVirtFlyDrawObj*>( _pSdrObj) != nullptr ) { @@ -683,7 +683,7 @@ const SwAnchoredObject* SwDrawContact::GetAnchoredObj( const SdrObject* _pSdrObj _pSdrObj == GetMaster(), "<SwDrawContact::GetAnchoredObj(..)> - provided object doesn't belongs to this contact" ); - const SwAnchoredObject* pRetAnchoredObj = 0L; + const SwAnchoredObject* pRetAnchoredObj = nullptr; if ( _pSdrObj ) { @@ -716,7 +716,7 @@ SwAnchoredObject* SwDrawContact::GetAnchoredObj( SdrObject* _pSdrObj ) OSL_ENSURE( GetUserCall( _pSdrObj ) == this || _pSdrObj == GetMaster(), "<SwDrawContact::GetAnchoredObj(..)> - provided object doesn't belongs to this contact" ); - SwAnchoredObject* pRetAnchoredObj = 0L; + SwAnchoredObject* pRetAnchoredObj = nullptr; if ( _pSdrObj ) { @@ -737,14 +737,14 @@ const SdrObject* SwDrawContact::GetMaster() const { return !mbMasterObjCleared ? maAnchoredDrawObj.GetDrawObj() - : 0L; + : nullptr; } SdrObject* SwDrawContact::GetMaster() { return !mbMasterObjCleared ? maAnchoredDrawObj.DrawObj() - : 0L; + : nullptr; } /** @@ -768,7 +768,7 @@ void SwDrawContact::SetMaster( SdrObject* _pNewMaster ) const SwFrm* SwDrawContact::GetAnchorFrm( const SdrObject* _pDrawObj ) const { - const SwFrm* pAnchorFrm = 0L; + const SwFrm* pAnchorFrm = nullptr; if ( !_pDrawObj || _pDrawObj == GetMaster() || ( !_pDrawObj->GetUserCall() && @@ -789,7 +789,7 @@ const SwFrm* SwDrawContact::GetAnchorFrm( const SdrObject* _pDrawObj ) const } SwFrm* SwDrawContact::GetAnchorFrm( SdrObject* _pDrawObj ) { - SwFrm* pAnchorFrm = 0L; + SwFrm* pAnchorFrm = nullptr; if ( !_pDrawObj || _pDrawObj == GetMaster() || ( !_pDrawObj->GetUserCall() && @@ -832,7 +832,7 @@ void SwDrawContact::DestroyVirtObj( SwDrawVirtObj* _pVirtObj ) if ( _pVirtObj ) { delete _pVirtObj; - _pVirtObj = 0; + _pVirtObj = nullptr; } } @@ -842,7 +842,7 @@ void SwDrawContact::DestroyVirtObj( SwDrawVirtObj* _pVirtObj ) */ SwDrawVirtObj* SwDrawContact::AddVirtObj() { - SwDrawVirtObj* pAddedDrawVirtObj = 0L; + SwDrawVirtObj* pAddedDrawVirtObj = nullptr; // check, if a disconnected 'virtual' drawing object exist and use it std::list<SwDrawVirtObj*>::const_iterator aFoundVirtObjIter = @@ -917,7 +917,7 @@ bool SwDrawContact::VirtObjAnchoredAtFrmPred::operator() ( const SwDrawVirtObj* /// get drawing object ('master' or 'virtual') by frame. SdrObject* SwDrawContact::GetDrawObjectByAnchorFrm( const SwFrm& _rAnchorFrm ) { - SdrObject* pRetDrawObj = 0L; + SdrObject* pRetDrawObj = nullptr; // #i26791# - compare master frames instead of direct frames const SwFrm* pProposedAnchorFrm = &_rAnchorFrm; @@ -1111,7 +1111,7 @@ class NestedUserCallHdl void DrawContactDeleted() { - mpDrawContact = 0; + mpDrawContact = nullptr; } bool IsNestedUserCall() const @@ -1198,7 +1198,7 @@ void SwDrawContact::_Changed( const SdrObject& rObj, NotifyBackgrdOfAllVirtObjs( pOldBoundRect ); } DisconnectFromLayout( false ); - SetMaster( NULL ); + SetMaster( nullptr ); delete this; // --> #i65784# Prevent memory corruption aNestedUserCallHdl.DrawContactDeleted(); @@ -1423,7 +1423,7 @@ namespace static const SwFormatAnchor* lcl_getAnchorFormat( const SfxPoolItem& _rItem ) { sal_uInt16 nWhich = _rItem.Which(); - const SwFormatAnchor* pAnchorFormat = NULL; + const SwFormatAnchor* pAnchorFormat = nullptr; if ( RES_ATTRSET_CHG == nWhich ) { static_cast<const SwAttrSetChg&>(_rItem).GetChgSet()-> @@ -1443,7 +1443,7 @@ void SwDrawContact::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) "<SwDrawContact::Modify(..)> called during disconnection."); sal_uInt16 nWhich = pNew ? pNew->Which() : 0; - const SwFormatAnchor* pNewAnchorFormat = pNew ? lcl_getAnchorFormat( *pNew ) : NULL; + const SwFormatAnchor* pNewAnchorFormat = pNew ? lcl_getAnchorFormat( *pNew ) : nullptr; if ( pNewAnchorFormat ) { @@ -1456,7 +1456,7 @@ void SwDrawContact::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) { // determine old object rectangle of 'master' drawing object // for notification - const Rectangle* pOldRect = 0L; + const Rectangle* pOldRect = nullptr; Rectangle aOldRect; if ( GetAnchorFrm() ) { @@ -1471,7 +1471,7 @@ void SwDrawContact::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) lcl_NotifyBackgroundOfObj( *this, *GetMaster(), pOldRect ); NotifyBackgrdOfAllVirtObjs( pOldRect ); - const SwFormatAnchor* pOldAnchorFormat = pOld ? lcl_getAnchorFormat( *pOld ) : NULL; + const SwFormatAnchor* pOldAnchorFormat = pOld ? lcl_getAnchorFormat( *pOld ) : nullptr; if ( !pOldAnchorFormat || ( pOldAnchorFormat->GetAnchorId() != pNewAnchorFormat->GetAnchorId() ) ) { OSL_ENSURE( maAnchoredDrawObj.DrawObj(), "SwDrawContact::Modify: no draw object here?" ); @@ -1506,8 +1506,8 @@ void SwDrawContact::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SfxItemState::SET == static_cast<const SwAttrSetChg*>(pNew)->GetChgSet()->GetItemState( RES_WRAP_INFLUENCE_ON_OBJPOS, false ) ) ) ) { - lcl_NotifyBackgroundOfObj( *this, *GetMaster(), 0L ); - NotifyBackgrdOfAllVirtObjs( 0L ); + lcl_NotifyBackgroundOfObj( *this, *GetMaster(), nullptr ); + NotifyBackgrdOfAllVirtObjs( nullptr ); _InvalidateObjs( true ); } else if ( RES_UL_SPACE == nWhich || RES_LR_SPACE == nWhich || @@ -1526,15 +1526,15 @@ void SwDrawContact::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SfxItemState::SET == static_cast<const SwAttrSetChg*>(pNew)->GetChgSet()->GetItemState( RES_FOLLOW_TEXT_FLOW, false ) ) ) ) { - lcl_NotifyBackgroundOfObj( *this, *GetMaster(), 0L ); - NotifyBackgrdOfAllVirtObjs( 0L ); + lcl_NotifyBackgroundOfObj( *this, *GetMaster(), nullptr ); + NotifyBackgrdOfAllVirtObjs( nullptr ); _InvalidateObjs(); } // #i35443# else if ( RES_ATTRSET_CHG == nWhich ) { - lcl_NotifyBackgroundOfObj( *this, *GetMaster(), 0L ); - NotifyBackgrdOfAllVirtObjs( 0L ); + lcl_NotifyBackgroundOfObj( *this, *GetMaster(), nullptr ); + NotifyBackgrdOfAllVirtObjs( nullptr ); _InvalidateObjs(); } else if ( RES_REMOVE_UNO_OBJECT == nWhich ) @@ -1550,7 +1550,7 @@ void SwDrawContact::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) } // #i51474# - GetAnchoredObj( 0L )->ResetLayoutProcessBools(); + GetAnchoredObj( nullptr )->ResetLayoutProcessBools(); } // #i26791# @@ -1577,7 +1577,7 @@ void SwDrawContact::_InvalidateObjs( const bool _bUpdateSortedObjsList ) } // invalidate position of 'master' drawing object - SwAnchoredObject* pAnchoredObj = GetAnchoredObj( 0L ); + SwAnchoredObject* pAnchoredObj = GetAnchoredObj( nullptr ); pAnchoredObj->InvalidateObjPos(); // #i28701# if ( _bUpdateSortedObjsList ) @@ -1644,7 +1644,7 @@ void SwDrawContact::RemoveMasterFromDrawPage() { if ( GetMaster() ) { - GetMaster()->SetUserCall( 0 ); + GetMaster()->SetUserCall( nullptr ); if ( GetMaster()->IsInserted() ) { static_cast<SwFrameFormat*>(GetRegisteredIn())->getIDocumentDrawModelAccess().GetDrawModel()->GetPage(0)-> @@ -1782,7 +1782,7 @@ void SwDrawContact::ConnectToLayout( const SwFormatAnchor* pAnch ) // anchor at first found frame the 'master' object and // at the following frames 'virtual' drawing objects. // Note: method is similar to <SwFlyFrameFormat::MakeFrms(..)> - SwModify *pModify = 0; + SwModify *pModify = nullptr; if( pAnch->GetContentAnchor() ) { if ( pAnch->GetAnchorId() == FLY_AT_FLY ) @@ -1823,7 +1823,7 @@ void SwDrawContact::ConnectToLayout( const SwFormatAnchor* pAnch ) } SwIterator<SwFrm,SwModify> aIter( *pModify ); - SwFrm* pAnchorFrmOfMaster = 0; + SwFrm* pAnchorFrmOfMaster = nullptr; for( SwFrm *pFrm = aIter.First(); pFrm; pFrm = aIter.Next() ) { // append drawing object, if @@ -1958,7 +1958,7 @@ void SwDrawContact::ChangeMasterObject( SdrObject *pNewMaster ) // consider 'virtual' drawing objects RemoveAllVirtObjs(); - GetMaster()->SetUserCall( 0 ); + GetMaster()->SetUserCall( nullptr ); SetMaster( pNewMaster ); GetMaster()->SetUserCall( this ); @@ -2219,7 +2219,7 @@ void SwDrawVirtObj::AddToDrawingPage() // insert 'virtual' drawing object into page, set layer and user call. SdrPage* pDrawPg; // #i27030# - apply order number of referenced object - if ( 0 != ( pDrawPg = pOrgMasterSdrObj->GetPage() ) ) + if ( nullptr != ( pDrawPg = pOrgMasterSdrObj->GetPage() ) ) { // #i27030# - apply order number of referenced object pDrawPg->InsertObject( this, GetReferencedObj().GetOrdNum() ); @@ -2242,7 +2242,7 @@ void SwDrawVirtObj::AddToDrawingPage() void SwDrawVirtObj::RemoveFromDrawingPage() { - SetUserCall( 0 ); + SetUserCall( nullptr ); if ( GetPage() ) { GetPage()->RemoveObject( GetOrdNum() ); diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index 04c10c069b80..67ce43953a14 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -540,7 +540,7 @@ void SwVirtFlyDrawObj::SetSnapRect(const Rectangle& ) SetRect(); SetChanged(); BroadcastObjectChange(); - if (pUserCall!=NULL) + if (pUserCall!=nullptr) pUserCall->Changed(*this, SDRUSERCALL_RESIZE, aTmp); } @@ -561,7 +561,7 @@ void SwVirtFlyDrawObj::SetLogicRect(const Rectangle& ) SetRect(); SetChanged(); BroadcastObjectChange(); - if (pUserCall!=NULL) + if (pUserCall!=nullptr) pUserCall->Changed(*this, SDRUSERCALL_RESIZE, aTmp); } @@ -994,7 +994,7 @@ SdrObject* SwVirtFlyDrawObj::CheckMacroHit( const SdrObjMacroHitRec& rRec ) cons pFlyFrm->GetFormat()->GetIMapObject( rRec.aPos, pFlyFrm )) return const_cast<SdrObject*>(static_cast<SdrObject const *>(this)); - return 0; + return nullptr; } } } diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx index 1c83dd3d3a66..31d69f70ae07 100644 --- a/sw/source/core/draw/dpage.cxx +++ b/sw/source/core/draw/dpage.cxx @@ -51,15 +51,15 @@ using namespace ::com::sun::star::frame; SwDPage::SwDPage(SwDrawModel& rNewModel, bool bMasterPage) : FmFormPage(rNewModel, bMasterPage), - pGridLst( 0 ), + pGridLst( nullptr ), pDoc(&rNewModel.GetDoc()) { } SwDPage::SwDPage(const SwDPage& rSrcPage) : FmFormPage( rSrcPage ), - pGridLst( 0 ), - pDoc( 0 ) + pGridLst( nullptr ), + pDoc( nullptr ) { if ( rSrcPage.pGridLst ) { @@ -89,13 +89,13 @@ void SwDPage::lateInit(const SwDPage& rPage, SwDrawModel* const pNewModel) SwDPage* SwDPage::Clone() const { - return Clone( 0 ); + return Clone( nullptr ); } SwDPage* SwDPage::Clone(SdrModel* const pNewModel) const { SwDPage* const pNewPage = new SwDPage( *this ); - SwDrawModel* pSwDrawModel = 0; + SwDrawModel* pSwDrawModel = nullptr; if ( pNewModel ) { pSwDrawModel = &dynamic_cast<SwDrawModel&>(*pNewModel); @@ -110,7 +110,7 @@ SdrObject* SwDPage::ReplaceObject( SdrObject* pNewObj, size_t nObjNum ) SdrObject *pOld = GetObj( nObjNum ); OSL_ENSURE( pOld, "Oups, Object not replaced" ); SdrObjUserCall* pContact; - if ( 0 != ( pContact = GetUserCall(pOld) ) && + if ( nullptr != ( pContact = GetUserCall(pOld) ) && RES_DRAWFRMFMT == static_cast<SwContact*>(pContact)->GetFormat()->Which()) static_cast<SwDrawContact*>(pContact)->ChangeMasterObject( pNewObj ); return FmFormPage::ReplaceObject( pNewObj, nObjNum ); diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx index f463541d5b3d..786d86f91d3a 100644 --- a/sw/source/core/draw/drawdoc.cxx +++ b/sw/source/core/draw/drawdoc.cxx @@ -82,7 +82,7 @@ SwDrawModel::SwDrawModel(SwDoc *const pDoc) *pRangeArr; pRangeArr += 2 ) for( sal_uInt16 nW = *pRangeArr, nEnd = *(pRangeArr+1); nW < nEnd; ++nW ) - if( 0 != (pItem = rDocPool.GetPoolDefaultItem( nW )) && + if( nullptr != (pItem = rDocPool.GetPoolDefaultItem( nW )) && 0 != (nSlotId = rDocPool.GetSlotId( nW ) ) && nSlotId != nW && 0 != (nEdtWhich = pSdrPool->GetWhich( nSlotId )) && diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx index 251b591c2d42..cdfc35a61873 100644 --- a/sw/source/core/draw/dview.cxx +++ b/sw/source/core/draw/dview.cxx @@ -77,7 +77,7 @@ bool SwSdrHdl::IsFocusHdl() const static const SwFrm *lcl_FindAnchor( const SdrObject *pObj, bool bAll ) { const SwVirtFlyDrawObj *pVirt = dynamic_cast< const SwVirtFlyDrawObj *>( pObj ) != nullptr ? - static_cast<const SwVirtFlyDrawObj*>(pObj) : 0; + static_cast<const SwVirtFlyDrawObj*>(pObj) : nullptr; if ( pVirt ) { if ( bAll || !pVirt->GetFlyFrm()->IsFlyInCntFrm() ) @@ -89,7 +89,7 @@ static const SwFrm *lcl_FindAnchor( const SdrObject *pObj, bool bAll ) if ( pCont ) return pCont->GetAnchorFrm( pObj ); } - return 0; + return nullptr; } SwDrawView::SwDrawView( SwViewShellImp &rI, SdrModel *pMd, OutputDevice *pOutDev) : @@ -175,7 +175,7 @@ SdrObject* impLocalHitCorrection(SdrObject* pRetval, const Point& rPnt, sal_uInt if(aInnerBound.isInside(basegfx::B2DPoint(rPnt.X(), rPnt.Y()))) { // exclude this hit - pRetval = 0; + pRetval = nullptr; } } } @@ -221,7 +221,7 @@ void SwDrawView::AddCustomHdl() return; const SwFrm* pAnch; - if(0 == (pAnch = CalcAnchor())) + if(nullptr == (pAnch = CalcAnchor())) return; Point aPos(aAnchorPoint); @@ -284,7 +284,7 @@ SdrObject* SwDrawView::GetMaxToTopObj( SdrObject* pObj ) const } } } - return 0; + return nullptr; } SdrObject* SwDrawView::GetMaxToBtmObj(SdrObject* pObj) const @@ -299,11 +299,11 @@ SdrObject* SwDrawView::GetMaxToBtmObj(SdrObject* pObj) const if ( pFly ) { SdrObject *pRet = const_cast<SdrObject*>(static_cast<SdrObject const *>(pFly->GetVirtDrawObj())); - return pRet != pObj ? pRet : 0; + return pRet != pObj ? pRet : nullptr; } } } - return 0; + return nullptr; } /// determine maximal order number for a 'child' object of given 'parent' object @@ -537,7 +537,7 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos, { size_t nTmpNewPos( nNewPos ); const SwFrameFormat* pParentFrameFormat = - pParentAnchoredObj ? &(pParentAnchoredObj->GetFrameFormat()) : 0L; + pParentAnchoredObj ? &(pParentAnchoredObj->GetFrameFormat()) : nullptr; const SdrObject* pTmpObj = pDrawPage->GetObj( nNewPos + 1 ); while ( pTmpObj ) { @@ -547,7 +547,7 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos, // section), no anchor frame exists. const SwFrm* pTmpAnchorFrm = lcl_FindAnchor( pTmpObj, true ); const SwFlyFrm* pTmpParentObj = pTmpAnchorFrm - ? pTmpAnchorFrm->FindFlyFrm() : 0L; + ? pTmpAnchorFrm->FindFlyFrm() : nullptr; if ( pTmpParentObj && &(pTmpParentObj->GetFrameFormat()) != pParentFrameFormat ) { @@ -600,7 +600,7 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos, // section), no anchor frame exists. const SwFrm* pTmpAnchorFrm = lcl_FindAnchor( pTmpObj, true ); const SwFlyFrm* pTmpParentObj = pTmpAnchorFrm - ? pTmpAnchorFrm->FindFlyFrm() : 0L; + ? pTmpAnchorFrm->FindFlyFrm() : nullptr; if ( pTmpParentObj && ( ( pTmpParentObj == pFlyFrm ) || ( pFlyFrm->IsUpperOf( *pTmpParentObj ) ) ) ) @@ -668,7 +668,7 @@ const SwFrm* SwDrawView::CalcAnchor() { const SdrMarkList &rMrkList = GetMarkedObjectList(); if ( rMrkList.GetMarkCount() != 1 ) - return NULL; + return nullptr; SdrObject* pObj = rMrkList.GetMark( 0 )->GetMarkedSdrObj(); @@ -707,7 +707,7 @@ const SwFrm* SwDrawView::CalcAnchor() if ( IsAction() ) { if ( !TakeDragObjAnchorPos( aPt, bTopRight ) ) - return NULL; + return nullptr; } else { @@ -739,7 +739,7 @@ const SwFrm* SwDrawView::CalcAnchor() if( pAnch && !pAnch->IsProtected() ) aAnchorPoint = pAnch->GetFrmAnchorPos( ::HasWrap( pObj ) ); else - pAnch = 0; + pAnch = nullptr; return pAnch; } @@ -818,7 +818,7 @@ void SwDrawView::CheckPossibilities() for ( size_t i = 0; !bProtect && i < rMrkList.GetMarkCount(); ++i ) { const SdrObject *pObj = rMrkList.GetMark( i )->GetMarkedSdrObj(); - const SwFrm *pFrm = NULL; + const SwFrm *pFrm = nullptr; if ( dynamic_cast< const SwVirtFlyDrawObj *>( pObj ) != nullptr ) { const SwFlyFrm *pFly = static_cast<const SwVirtFlyDrawObj*>(pObj)->GetFlyFrm(); @@ -925,7 +925,7 @@ void SwDrawView::DeleteMarked() SwRootFrm *pTmpRoot = pDoc->getIDocumentLayoutAccess().GetCurrentLayout(); if ( pTmpRoot ) pTmpRoot->StartAllAction(); - pDoc->GetIDocumentUndoRedo().StartUndo(UNDO_EMPTY, NULL); + pDoc->GetIDocumentUndoRedo().StartUndo(UNDO_EMPTY, nullptr); // replace marked <SwDrawVirtObj>-objects by its reference objects. { SdrPageView* pDrawPageView = rImp.GetPageView(); @@ -960,7 +960,7 @@ void SwDrawView::DeleteMarked() for (std::vector<SwFrameFormat*>::iterator i = aTextBoxesToDelete.begin(); i != aTextBoxesToDelete.end(); ++i) pDoc->getIDocumentLayoutAccess().DelLayoutFormat(*i); } - pDoc->GetIDocumentUndoRedo().EndUndo(UNDO_EMPTY, NULL); + pDoc->GetIDocumentUndoRedo().EndUndo(UNDO_EMPTY, nullptr); if( pTmpRoot ) pTmpRoot->EndAllAction(); } @@ -970,7 +970,7 @@ SdrUndoManager* SwDrawView::getSdrUndoManagerForEnhancedTextEdit() const { SwDoc* pDoc = Imp().GetShell()->GetDoc(); - return pDoc ? dynamic_cast< SdrUndoManager* >(&(pDoc->GetUndoManager())) : 0; + return pDoc ? dynamic_cast< SdrUndoManager* >(&(pDoc->GetUndoManager())) : nullptr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |