diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:22:39 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:36 +0100 |
commit | de29ac09535d814e4be7e1bf0f10beb9f0f847e3 (patch) | |
tree | 139f75d657cb825622e812254b8b7df4e509140b /sc/source/ui/drawfunc/fudraw.cxx | |
parent | 60c40af090e420a8619b5236bde1ff4ef79100c6 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I765d2a600f9c57da50c85354688e3ae796750d94
Diffstat (limited to 'sc/source/ui/drawfunc/fudraw.cxx')
-rw-r--r-- | sc/source/ui/drawfunc/fudraw.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx index 073508bb4aaf..56c519e2f85b 100644 --- a/sc/source/ui/drawfunc/fudraw.cxx +++ b/sc/source/ui/drawfunc/fudraw.cxx @@ -208,7 +208,7 @@ static bool lcl_KeyEditMode( SdrObject* pObj, ScTabViewShell* pViewShell, const if ( pPoor && pPoor->GetSlotID() == nTextSlotId ) // no RTTI { FuText* pText = static_cast<FuText*>(pPoor); - pText->SetInEditMode( pObj, NULL, true, pInitialKey ); + pText->SetInEditMode( pObj, nullptr, true, pInitialKey ); //! set cursor to end of text } bReturn = true; @@ -276,7 +276,7 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt) // consumed bReturn = true; } - else if ( lcl_KeyEditMode( pObj, pViewShell, NULL ) ) // start text edit for suitable object + else if ( lcl_KeyEditMode( pObj, pViewShell, nullptr ) ) // start text edit for suitable object bReturn = true; } } @@ -293,7 +293,7 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt) if( !pView->IsTextEdit() && 1 == rMarkList.GetMarkCount() ) { SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); - if ( lcl_KeyEditMode( pObj, pViewShell, NULL ) ) // start text edit for suitable object + if ( lcl_KeyEditMode( pObj, pViewShell, nullptr ) ) // start text edit for suitable object bReturn = true; } } @@ -483,7 +483,7 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt) const SdrHdlList& rHdlList = pView->GetHdlList(); SdrHdl* pHdl = rHdlList.GetFocusHdl(); - if(0L == pHdl) + if(nullptr == pHdl) { // only take action when move is allowed if(pView->IsMoveAllowed()) @@ -540,7 +540,7 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt) const SdrDragStat& rDragStat = pView->GetDragStat(); // start dragging - pView->BegDragObj(aStartPoint, 0, pHdl, 0); + pView->BegDragObj(aStartPoint, nullptr, pHdl, 0); if(pView->IsDragObj()) { @@ -609,10 +609,10 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt) pView->MarkPoint(*pHdl); } - if(0L == rHdlList.GetFocusHdl()) + if(nullptr == rHdlList.GetFocusHdl()) { // restore point with focus - SdrHdl* pNewOne = 0L; + SdrHdl* pNewOne = nullptr; for(size_t a = 0; !pNewOne && a < rHdlList.GetHdlCount(); ++a) { @@ -698,7 +698,7 @@ static bool lcl_UrlHit( SdrView* pView, const Point& rPosPixel, vcl::Window* pWi MouseEvent aMEvt( rPosPixel, 1, MouseEventModifiers::NONE, MOUSE_LEFT ); SdrHitKind eHit = pView->PickAnything( aMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt ); - if ( eHit != SDRHIT_NONE && aVEvt.pObj != NULL ) + if ( eHit != SDRHIT_NONE && aVEvt.pObj != nullptr ) { if ( ScDrawLayer::GetIMapInfo( aVEvt.pObj ) && ScDrawLayer::GetHitIMapObject( aVEvt.pObj, pWindow->PixelToLogic(rPosPixel), *pWindow ) ) @@ -722,12 +722,12 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) SdrObject* pObj; SdrPageView* pPV; - ScMacroInfo* pInfo = 0; + ScMacroInfo* pInfo = nullptr; if ( pView->PickObj(aPnt, pView->getHitTolLog(), pObj, pPV, SdrSearchOptions::ALSOONMASTER) ) { if ( pObj->IsGroupObject() ) { - SdrObject* pHit = 0; + SdrObject* pHit = nullptr; if ( pView->PickObj(aMDPos, pView->getHitTolLog(), pHit, pPV, SdrSearchOptions::DEEP ) ) pObj = pHit; } |