diff options
Diffstat (limited to 'sd/source/ui/func/fuoaprms.cxx')
| -rw-r--r-- | sd/source/ui/func/fuoaprms.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx index 6216f82033bc..6d2e16aa18aa 100644 --- a/sd/source/ui/func/fuoaprms.cxx +++ b/sd/source/ui/func/fuoaprms.cxx @@ -292,7 +292,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) SdrObjKind eKind2 = (SdrObjKind)pObject2->GetObjIdentifier(); SdAnimationInfo* pInfo1 = mpDoc->GetAnimationInfo(pObject1); SdAnimationInfo* pInfo2 = mpDoc->GetAnimationInfo(pObject2); - pInfo = NULL; + pInfo = nullptr; if (pObject1->GetObjInventor() == SdrInventor && ((eKind1 == OBJ_LINE) || // 2 point line @@ -446,7 +446,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) aSet.Put(SfxBoolItem(ATTR_ACTION_PLAYFULL, false)); SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); - std::unique_ptr<SfxAbstractDialog> pDlg(pFact ? pFact->CreatSdActionDialog( NULL, &aSet, mpView ) : 0); + std::unique_ptr<SfxAbstractDialog> pDlg(pFact ? pFact->CreatSdActionDialog( nullptr, &aSet, mpView ) : nullptr); short nResult = pDlg ? pDlg->Execute() : static_cast<short>(RET_CANCEL); @@ -626,7 +626,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) pUndoGroup->SetComment(aComment); // for the path effect, remember some stuff - SdrPathObj* pPath = NULL; + SdrPathObj* pPath = nullptr; if (eEffect == presentation::AnimationEffect_PATH && nEffectSet == ATTR_SET) { DBG_ASSERT(nCount == 2, "This effect expects two selected objects"); @@ -634,7 +634,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) SdrObject* pObject2 = rMarkList.GetMark(1)->GetMarkedSdrObj(); SdrObjKind eKind1 = (SdrObjKind)pObject1->GetObjIdentifier(); SdrObjKind eKind2 = (SdrObjKind)pObject2->GetObjIdentifier(); - SdrObject* pRunningObj = NULL; + SdrObject* pRunningObj = nullptr; if (pObject1->GetObjInventor() == SdrInventor && ((eKind1 == OBJ_LINE) || // 2 point line |