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/layout/ssfrm.cxx | |
| parent | 6cd7bf2043146a630925a2e49336f02c802f707a (diff) | |
loplugin:nullptr (automatic rewrite)
Change-Id: I01e11fa956a249974e77dce9deebe79311f098d0
Diffstat (limited to 'sw/source/core/layout/ssfrm.cxx')
| -rw-r--r-- | sw/source/core/layout/ssfrm.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx index 462aef106c8c..1e1db225397d 100644 --- a/sw/source/core/layout/ssfrm.cxx +++ b/sw/source/core/layout/ssfrm.cxx @@ -226,8 +226,8 @@ void SwFrm::CheckDirChange() } SwFrm* pFrm = static_cast<SwLayoutFrm*>(this)->Lower(); - const SwFormatCol* pCol = NULL; - SwLayoutFrm* pBody = 0; + const SwFormatCol* pCol = nullptr; + SwLayoutFrm* pBody = nullptr; if( pFrm ) { if( IsPageFrm() ) @@ -367,7 +367,7 @@ void SwFrm::DestroyImpl() } } delete mpDrawObjs; - mpDrawObjs = 0; + mpDrawObjs = nullptr; } } @@ -422,7 +422,7 @@ SwContentFrm::SwContentFrm( SwContentNode * const pContent, SwFrm* pSib ) : void SwContentFrm::DestroyImpl() { const SwContentNode* pCNd; - if( 0 != ( pCNd = dynamic_cast<SwContentNode*>( GetRegisteredIn() ) ) && + if( nullptr != ( pCNd = dynamic_cast<SwContentNode*>( GetRegisteredIn() ) ) && !pCNd->GetDoc()->IsInDtor() ) { //Unregister from root if I'm still in turbo there. |