diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:11:17 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:18 +0100 |
commit | 40c4a086521703e64f7f182d8e07490855cfeb0a (patch) | |
tree | 713a700c6bc2966a3d8376c5c9da661e90fd2c50 /chart2/source/controller/drawinglayer/DrawViewWrapper.cxx | |
parent | c40c7a8c364bd8f1d7777e803e5a6b0cfddeaca3 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I71de514405bb9bcc746c1ab9633e7fe659888943
Diffstat (limited to 'chart2/source/controller/drawinglayer/DrawViewWrapper.cxx')
-rw-r--r-- | chart2/source/controller/drawinglayer/DrawViewWrapper.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx index be031a0f22e8..1166959499cd 100644 --- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx +++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx @@ -59,7 +59,7 @@ namespace // this code is copied from sfx2/source/doc/objembed.cxx SfxObjectShell * lcl_GetParentObjectShell( const uno::Reference< frame::XModel > & xModel ) { - SfxObjectShell* pResult = NULL; + SfxObjectShell* pResult = nullptr; try { @@ -90,14 +90,14 @@ OutputDevice * lcl_GetParentRefDevice( const uno::Reference< frame::XModel > & x SfxObjectShell * pParent = lcl_GetParentObjectShell( xModel ); if ( pParent ) return pParent->GetDocumentRefDev(); - return NULL; + return nullptr; } } DrawViewWrapper::DrawViewWrapper( SdrModel* pSdrModel, OutputDevice* pOut, bool bPaintPageForEditMode) : E3dView(pSdrModel, pOut) - , m_pMarkHandleProvider(NULL) + , m_pMarkHandleProvider(nullptr) , m_apOutliner(SdrMakeOutliner(OUTLINERMODE_TEXTOBJECT, *pSdrModel)) , m_bRestoreMapMode( false ) { @@ -108,7 +108,7 @@ DrawViewWrapper::DrawViewWrapper( SdrModel* pSdrModel, OutputDevice* pOut, bool // #i12587# support for shapes in chart SdrOutliner* pOutliner = getOutliner(); - SfxItemPool* pOutlinerPool = ( pOutliner ? pOutliner->GetEditTextObjectPool() : NULL ); + SfxItemPool* pOutlinerPool = ( pOutliner ? pOutliner->GetEditTextObjectPool() : nullptr ); if ( pOutlinerPool ) { SvtLinguConfig aLinguConfig; @@ -174,7 +174,7 @@ void DrawViewWrapper::SetMarkHandles() SdrObject* DrawViewWrapper::getHitObject( const Point& rPnt ) const { - SdrObject* pRet = NULL; + SdrObject* pRet = nullptr; SdrSearchOptions nOptions = SdrSearchOptions::DEEP | SdrSearchOptions::TESTMARKABLE; SdrPageView* pSdrPageView = this->GetPageView(); @@ -242,7 +242,7 @@ void DrawViewWrapper::CompleteRedraw(OutputDevice* pOut, const vcl::Region& rReg SdrObject* DrawViewWrapper::getSelectedObject() const { - SdrObject* pObj(NULL); + SdrObject* pObj(nullptr); const SdrMarkList& rMarkList = this->GetMarkedObjectList(); if(rMarkList.GetMarkCount() == 1) { @@ -255,7 +255,7 @@ SdrObject* DrawViewWrapper::getSelectedObject() const SdrObject* DrawViewWrapper::getTextEditObject() const { SdrObject* pObj = this->getSelectedObject(); - SdrObject* pTextObj = NULL; + SdrObject* pTextObj = nullptr; if( pObj && pObj->HasTextEdit()) pTextObj = static_cast<SdrTextObj*>(pObj); return pTextObj; @@ -293,13 +293,13 @@ SfxItemSet DrawViewWrapper::getPositionAndSizeItemSetFromMarkedObject() const SdrObject* DrawViewWrapper::getNamedSdrObject( const OUString& rName ) const { if(rName.isEmpty()) - return 0; + return nullptr; SdrPageView* pSdrPageView = this->GetPageView(); if( pSdrPageView ) { return DrawModelWrapper::getNamedSdrObject( rName, pSdrPageView->GetObjList() ); } - return 0; + return nullptr; } bool DrawViewWrapper::IsObjectHit( SdrObject* pObj, const Point& rPnt ) @@ -331,7 +331,7 @@ void DrawViewWrapper::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) E3dView::Notify(rBC, rHint); - if( pSdrHint != 0 ) + if( pSdrHint != nullptr ) { SdrHintKind eKind = pSdrHint->GetKind(); if( eKind == HINT_BEGEDIT ) @@ -365,7 +365,7 @@ void DrawViewWrapper::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SdrObject* DrawViewWrapper::getSdrObject( const uno::Reference< drawing::XShape >& xShape ) { - SdrObject* pRet = 0; + SdrObject* pRet = nullptr; uno::Reference< lang::XUnoTunnel > xUnoTunnel( xShape, uno::UNO_QUERY ); uno::Reference< lang::XTypeProvider > xTypeProvider( xShape, uno::UNO_QUERY ); if(xUnoTunnel.is()&&xTypeProvider.is()) |