diff options
Diffstat (limited to 'svx/source/svdraw/svdcrtv.cxx')
| -rw-r--r-- | svx/source/svdraw/svdcrtv.cxx | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index fe3aceabc9c2..709ba718ea4d 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -189,7 +189,7 @@ void SdrCreateView::ImpClearConnectMarker() if(mpCoMaOverlay) { delete mpCoMaOverlay; - mpCoMaOverlay = 0L; + mpCoMaOverlay = nullptr; } } @@ -197,8 +197,8 @@ void SdrCreateView::ImpClearVars() { nAktInvent=SdrInventor; nAktIdent=OBJ_NONE; - pAktCreate=NULL; - pCreatePV=NULL; + pAktCreate=nullptr; + pCreatePV=nullptr; bAutoTextEdit=false; b1stPointAsCenter=false; aAktCreatePointer=Pointer(PointerStyle::Cross); @@ -212,7 +212,7 @@ void SdrCreateView::ImpClearVars() SdrCreateView::SdrCreateView(SdrModel* pModel1, OutputDevice* pOut) : SdrDragView(pModel1,pOut), - mpCoMaOverlay(0L), + mpCoMaOverlay(nullptr), mpCreateViewExtraData(new ImpSdrCreateViewExtraData()) { ImpClearVars(); @@ -227,26 +227,26 @@ SdrCreateView::~SdrCreateView() bool SdrCreateView::IsAction() const { - return SdrDragView::IsAction() || pAktCreate!=NULL; + return SdrDragView::IsAction() || pAktCreate!=nullptr; } void SdrCreateView::MovAction(const Point& rPnt) { SdrDragView::MovAction(rPnt); - if (pAktCreate!=NULL) { + if (pAktCreate!=nullptr) { MovCreateObj(rPnt); } } void SdrCreateView::EndAction() { - if (pAktCreate!=NULL) EndCreateObj(SDRCREATE_FORCEEND); + if (pAktCreate!=nullptr) EndCreateObj(SDRCREATE_FORCEEND); SdrDragView::EndAction(); } void SdrCreateView::BckAction() { - if (pAktCreate!=NULL) BckCreateObj(); + if (pAktCreate!=nullptr) BckCreateObj(); SdrDragView::BckAction(); } @@ -258,7 +258,7 @@ void SdrCreateView::BrkAction() void SdrCreateView::TakeActionRect(Rectangle& rRect) const { - if (pAktCreate!=NULL) + if (pAktCreate!=nullptr) { rRect=maDragStat.GetActionRect(); if (rRect.IsEmpty()) @@ -274,7 +274,7 @@ void SdrCreateView::TakeActionRect(Rectangle& rRect) const bool SdrCreateView::CheckEdgeMode() { - if (pAktCreate!=NULL) + if (pAktCreate!=nullptr) { // is managed by EdgeObj if (nAktInvent==SdrInventor && nAktIdent==OBJ_EDGE) return false; @@ -330,9 +330,9 @@ bool SdrCreateView::MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) { // TODO: Change default hit tolerance at IsMarkedHit() some time! Point aPos(pWin->PixelToLogic(rMEvt.GetPosPixel())); - bool bMarkHit=PickHandle(aPos)!=NULL || IsMarkedObjHit(aPos); + bool bMarkHit=PickHandle(aPos)!=nullptr || IsMarkedObjHit(aPos); SdrObjConnection aCon; - if (!bMarkHit) SdrEdgeObj::ImpFindConnector(aPos,*pPV,aCon,NULL,pWin); + if (!bMarkHit) SdrEdgeObj::ImpFindConnector(aPos,*pPV,aCon,nullptr,pWin); SetConnectMarker(aCon,*pPV); } } @@ -360,7 +360,7 @@ void SdrCreateView::SetCurrentObj(sal_uInt16 nIdent, sal_uInt32 nInvent) { nAktInvent=nInvent; nAktIdent=nIdent; - SdrObject* pObj = SdrObjFactory::MakeNewObject(nInvent,nIdent,NULL); + SdrObject* pObj = SdrObjFactory::MakeNewObject(nInvent,nIdent,nullptr); if(pObj) { @@ -396,7 +396,7 @@ bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const ImpClearConnectMarker(); - if (pPV!=NULL) + if (pPV!=nullptr) { pCreatePV=pPV; } @@ -404,7 +404,7 @@ bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const { pCreatePV = GetSdrPageView(); } - if (pCreatePV!=NULL) + if (pCreatePV!=nullptr) { // otherwise no side registered! OUString aLay(maActualLayer); @@ -441,9 +441,9 @@ bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const nAktIdent!=sal_uInt16(OBJ_FREEFILL) )) { // no snapping for Edge and Freehand aPnt=GetSnapPos(aPnt,pCreatePV); } - if (pAktCreate!=NULL) + if (pAktCreate!=nullptr) { - if (mpDefaultStyleSheet!=NULL) pAktCreate->NbcSetStyleSheet(mpDefaultStyleSheet, false); + if (mpDefaultStyleSheet!=nullptr) pAktCreate->NbcSetStyleSheet(mpDefaultStyleSheet, false); // SW uses a naked SdrObject for frame construction. Normally, such an // object should not be created. Since it is possible to use it as a helper @@ -515,8 +515,8 @@ bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const else { SdrObject::Free( pAktCreate ); - pAktCreate=NULL; - pCreatePV=NULL; + pAktCreate=nullptr; + pCreatePV=nullptr; } } } @@ -526,7 +526,7 @@ bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const bool SdrCreateView::BegCreateObj(const Point& rPnt, OutputDevice* pOut, short nMinMov, SdrPageView* pPV) { - return ImpBegCreateObj(nAktInvent,nAktIdent,rPnt,pOut,nMinMov,pPV,Rectangle(), 0L); + return ImpBegCreateObj(nAktInvent,nAktIdent,rPnt,pOut,nMinMov,pPV,Rectangle(), nullptr); } bool SdrCreateView::BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMinMov, SdrObject* pPreparedFactoryObject) @@ -540,19 +540,19 @@ bool SdrCreateView::BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMinMov nIdent = pPreparedFactoryObject->GetObjIdentifier(); } - return ImpBegCreateObj(nInvent, nIdent, rPnt, 0L, nMinMov, 0L, Rectangle(), pPreparedFactoryObject); + return ImpBegCreateObj(nInvent, nIdent, rPnt, nullptr, nMinMov, nullptr, Rectangle(), pPreparedFactoryObject); } bool SdrCreateView::BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz, OutputDevice* pOut, short nMinMov, SdrPageView* pPV) { return ImpBegCreateObj(SdrInventor,OBJ_CAPTION,rPnt,pOut,nMinMov,pPV, - Rectangle(rPnt,Size(rObjSiz.Width()+1,rObjSiz.Height()+1)), 0L); + Rectangle(rPnt,Size(rObjSiz.Width()+1,rObjSiz.Height()+1)), nullptr); } void SdrCreateView::MovCreateObj(const Point& rPnt) { - if (pAktCreate!=NULL) { + if (pAktCreate!=nullptr) { Point aPnt(rPnt); if (!maDragStat.IsNoSnap()) { @@ -599,7 +599,7 @@ bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) SdrObject* pObjMerk=pAktCreate; SdrPageView* pPVMerk=pCreatePV; - if (pAktCreate!=NULL) + if (pAktCreate!=nullptr) { sal_uIntPtr nCount=maDragStat.GetPointAnz(); @@ -622,7 +622,7 @@ bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) { // otherwise Brk, because all points are equal SdrObject* pObj=pAktCreate; - pAktCreate=NULL; + pAktCreate=nullptr; const SdrLayerAdmin& rAd = pCreatePV->GetPage()->GetLayerAdmin(); SdrLayerID nLayer(0); @@ -659,7 +659,7 @@ bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) { // delete object, its content is cloned and inserted SdrObject::Free( pObjMerk ); - pObjMerk = 0L; + pObjMerk = nullptr; bSceneIntoScene = true; } } @@ -670,7 +670,7 @@ bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) InsertObjectAtView(pObj, *pCreatePV); } - pCreatePV=NULL; + pCreatePV=nullptr; bRet=true; // sal_True = event interpreted } else @@ -694,10 +694,10 @@ bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) bRet=true; } } - if (bRet && pObjMerk!=NULL && IsTextEditAfterCreate()) + if (bRet && pObjMerk!=nullptr && IsTextEditAfterCreate()) { SdrTextObj* pText=dynamic_cast<SdrTextObj*>( pObjMerk ); - if (pText!=NULL && pText->IsTextFrame()) + if (pText!=nullptr && pText->IsTextFrame()) { SdrBeginTextEdit(pText, pPVMerk, nullptr, true); } @@ -708,7 +708,7 @@ bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) void SdrCreateView::BckCreateObj() { - if (pAktCreate!=NULL) + if (pAktCreate!=nullptr) { if (maDragStat.GetPointAnz()<=2 ) { @@ -732,13 +732,13 @@ void SdrCreateView::BckCreateObj() void SdrCreateView::BrkCreateObj() { - if (pAktCreate!=NULL) + if (pAktCreate!=nullptr) { HideCreateObj(); pAktCreate->BrkCreate(maDragStat); SdrObject::Free( pAktCreate ); - pAktCreate=NULL; - pCreatePV=NULL; + pAktCreate=nullptr; + pCreatePV=nullptr; } } @@ -841,7 +841,7 @@ void SdrCreateView::ShowCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/) // object according to current zoom so as objects relative // position to grid appears stable aPoly.transform( basegfx::tools::createTranslateB2DHomMatrix( aGridOff.X(), aGridOff.Y() ) ); - mpCreateViewExtraData->CreateAndShowOverlay(*this, 0, aPoly); + mpCreateViewExtraData->CreateAndShowOverlay(*this, nullptr, aPoly); } // #i101679# Force changed overlay to be shown @@ -905,7 +905,7 @@ bool SdrCreateView::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll) SfxStyleSheet* SdrCreateView::GetStyleSheet() const { - if (pAktCreate!=NULL) + if (pAktCreate!=nullptr) { return pAktCreate->GetStyleSheet(); } @@ -917,7 +917,7 @@ SfxStyleSheet* SdrCreateView::GetStyleSheet() const bool SdrCreateView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr) { - if (pAktCreate!=NULL) + if (pAktCreate!=nullptr) { pAktCreate->SetStyleSheet(pStyleSheet,bDontRemoveHardAttr); return true; |