summaryrefslogtreecommitdiff
path: root/svx/source/svdraw/svdmrkv1.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/svdraw/svdmrkv1.cxx')
-rw-r--r--svx/source/svdraw/svdmrkv1.cxx62
1 files changed, 31 insertions, 31 deletions
diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx
index 61b241c3c4f6..beb13620e84d 100644
--- a/svx/source/svdraw/svdmrkv1.cxx
+++ b/svx/source/svdraw/svdmrkv1.cxx
@@ -76,7 +76,7 @@ bool SdrMarkView::HasMarkedPoints() const
for (size_t nMarkNum=0; nMarkNum<nMarkCount && !bRet; ++nMarkNum) {
const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
const SdrUShortCont* pPts=pM->GetMarkedPoints();
- bRet=pPts!=NULL && !pPts->empty();
+ bRet=pPts!=nullptr && !pPts->empty();
}
}
}
@@ -93,7 +93,7 @@ sal_uIntPtr SdrMarkView::GetMarkedPointCount() const
for (size_t nMarkNum=0; nMarkNum<nMarkCount; ++nMarkNum) {
const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
const SdrUShortCont* pPts=pM->GetMarkedPoints();
- if (pPts!=NULL) nCount+=pPts->size();
+ if (pPts!=nullptr) nCount+=pPts->size();
}
}
}
@@ -102,7 +102,7 @@ sal_uIntPtr SdrMarkView::GetMarkedPointCount() const
bool SdrMarkView::IsPointMarkable(const SdrHdl& rHdl) const
{
- return !ImpIsFrameHandles() && !rHdl.IsPlusHdl() && rHdl.GetKind()!=HDL_GLUE && rHdl.GetKind()!=HDL_SMARTTAG && rHdl.GetObj()!=NULL && rHdl.GetObj()->IsPolyObj();
+ return !ImpIsFrameHandles() && !rHdl.IsPlusHdl() && rHdl.GetKind()!=HDL_GLUE && rHdl.GetKind()!=HDL_SMARTTAG && rHdl.GetObj()!=nullptr && rHdl.GetObj()->IsPolyObj();
}
bool SdrMarkView::MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, bool bUnmark)
@@ -112,17 +112,17 @@ bool SdrMarkView::MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, bool bUnmark)
bool SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, bool bUnmark)
{
- if (pHdl==NULL || pHdl->IsPlusHdl() || pHdl->GetKind()==HDL_GLUE)
+ if (pHdl==nullptr || pHdl->IsPlusHdl() || pHdl->GetKind()==HDL_GLUE)
return false;
if (pHdl->IsSelected() != bUnmark)
return false;
SdrObject* pObj=pHdl->GetObj();
- if (pObj==NULL || !pObj->IsPolyObj())
+ if (pObj==nullptr || !pObj->IsPolyObj())
return false;
- if (pMark==NULL)
+ if (pMark==nullptr)
{
const size_t nMarkNum=TryToFindMarkedObject(pObj);
if (nMarkNum==SAL_MAX_SIZE)
@@ -157,7 +157,7 @@ bool SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, bool bUnmark)
for (sal_uInt32 i=0; i<nCount; i++)
{
SdrHdl* pPlusHdl=pObj->GetPlusHdl(*pHdl,i);
- if (pPlusHdl!=NULL)
+ if (pPlusHdl!=nullptr)
{
pPlusHdl->SetObj(pObj);
pPlusHdl->SetPageView(pMark->GetPageView());
@@ -212,9 +212,9 @@ bool SdrMarkView::MarkPoints(const Rectangle* pRect, bool bUnmark)
ForceUndirtyMrkPnt();
bool bChgd=false;
SortMarkedObjects();
- const SdrObject* pObj0=NULL;
- const SdrPageView* pPV0=NULL;
- SdrMark* pM=NULL;
+ const SdrObject* pObj0=nullptr;
+ const SdrPageView* pPV0=nullptr;
+ SdrMark* pM=nullptr;
maHdlList.Sort();
const size_t nHdlAnz=maHdlList.GetHdlCount();
for (size_t nHdlNum=nHdlAnz; nHdlNum>0;) {
@@ -223,7 +223,7 @@ bool SdrMarkView::MarkPoints(const Rectangle* pRect, bool bUnmark)
if (IsPointMarkable(*pHdl) && pHdl->IsSelected()==bUnmark) {
const SdrObject* pObj=pHdl->GetObj();
const SdrPageView* pPV=pHdl->GetPageView();
- if (pObj!=pObj0 || pPV!=pPV0 || pM==NULL) { // This section is for optimization,
+ if (pObj!=pObj0 || pPV!=pPV0 || pM==nullptr) { // This section is for optimization,
const size_t nMarkNum=TryToFindMarkedObject(pObj); // so ImpMarkPoint() doesn't always
if (nMarkNum!=SAL_MAX_SIZE) { // have to search the object in the MarkList.
pM=GetSdrMarkByIndex(nMarkNum);
@@ -236,11 +236,11 @@ bool SdrMarkView::MarkPoints(const Rectangle* pRect, bool bUnmark)
OSL_FAIL("SdrMarkView::MarkPoints(const Rectangle* pRect): Selected object not found.");
}
#endif
- pM=NULL;
+ pM=nullptr;
}
}
Point aPos(pHdl->GetPos());
- if (pM!=NULL && (pRect==NULL || pRect->IsInside(aPos))) {
+ if (pM!=nullptr && (pRect==nullptr || pRect->IsInside(aPos))) {
if (ImpMarkPoint(pHdl,pM,bUnmark)) bChgd=true;
}
}
@@ -319,7 +319,7 @@ void SdrMarkView::UndirtyMrkPnt() const
const SdrObject* pObj=pM->GetMarkedSdrObj();
// PolyPoints
SdrUShortCont* pPts=pM->GetMarkedPoints();
- if (pPts!=NULL) {
+ if (pPts!=nullptr) {
if (pObj->IsPolyObj()) {
// Remove invalid selected points, that is, all
// entries above the number of points in the object.
@@ -346,8 +346,8 @@ void SdrMarkView::UndirtyMrkPnt() const
// GluePoints
pPts=pM->GetMarkedGluePoints();
const SdrGluePointList* pGPL=pObj->GetGluePointList();
- if (pPts!=NULL) {
- if (pGPL!=NULL) {
+ if (pPts!=nullptr) {
+ if (pGPL!=nullptr) {
// Remove invalid selected glue points, that is, all entries
// (IDs) that aren't contained in the GluePointList of the
// object
@@ -362,7 +362,7 @@ void SdrMarkView::UndirtyMrkPnt() const
++it;
}
} else {
- if (pPts!=NULL && !pPts->empty()) {
+ if (pPts!=nullptr && !pPts->empty()) {
pPts->clear(); // object doesn't have any glue points (any more)
bChg=true;
}
@@ -410,7 +410,7 @@ bool SdrMarkView::HasMarkedGluePoints() const
for (size_t nMarkNum=0; nMarkNum<nMarkCount && !bRet; ++nMarkNum) {
const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
const SdrUShortCont* pPts=pM->GetMarkedGluePoints();
- bRet=pPts!=NULL && !pPts->empty();
+ bRet=pPts!=nullptr && !pPts->empty();
}
return bRet;
}
@@ -427,13 +427,13 @@ bool SdrMarkView::MarkGluePoints(const Rectangle* pRect, bool bUnmark)
const SdrObject* pObj=pM->GetMarkedSdrObj();
const SdrGluePointList* pGPL=pObj->GetGluePointList();
SdrUShortCont* pPts=pM->GetMarkedGluePoints();
- if (bUnmark && pRect==NULL) { // UnmarkAll
- if (pPts!=NULL && !pPts->empty()) {
+ if (bUnmark && pRect==nullptr) { // UnmarkAll
+ if (pPts!=nullptr && !pPts->empty()) {
pPts->clear();
bChgd=true;
}
} else {
- if (pGPL!=NULL && (pPts!=NULL || !bUnmark)) {
+ if (pGPL!=nullptr && (pPts!=nullptr || !bUnmark)) {
sal_uInt16 nGPAnz=pGPL->GetCount();
for (sal_uInt16 nGPNum=0; nGPNum<nGPAnz; nGPNum++) {
const SdrGluePoint& rGP=(*pGPL)[nGPNum];
@@ -442,8 +442,8 @@ bool SdrMarkView::MarkGluePoints(const Rectangle* pRect, bool bUnmark)
if(rGP.IsUserDefined())
{
Point aPos(rGP.GetAbsolutePos(*pObj));
- if (pRect==NULL || pRect->IsInside(aPos)) {
- if (pPts==NULL)
+ if (pRect==nullptr || pRect->IsInside(aPos)) {
+ if (pPts==nullptr)
pPts=pM->ForceMarkedGluePoints();
bool bContains = pPts->find( rGP.GetId() ) != pPts->end();
if (!bUnmark && !bContains) {
@@ -471,13 +471,13 @@ bool SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16
{
SdrObject* pObj0=rpObj;
sal_uInt16 nId0=rnId;
- rpObj=NULL; rpPV=NULL; rnId=0;
+ rpObj=nullptr; rpPV=nullptr; rnId=0;
if (!IsGluePointEditMode()) return false;
bool bBack(nOptions & SdrSearchOptions::BACKWARD);
bool bNext(nOptions & SdrSearchOptions::NEXT);
OutputDevice* pOut=mpActualOutDev.get();
- if (pOut==NULL) pOut=GetFirstOutputDevice();
- if (pOut==NULL) return false;
+ if (pOut==nullptr) pOut=GetFirstOutputDevice();
+ if (pOut==nullptr) return false;
SortMarkedObjects();
const size_t nMarkCount=GetMarkedObjectCount();
size_t nMarkNum=bBack ? 0 : nMarkCount;
@@ -492,7 +492,7 @@ bool SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16
SdrObject* pObj=pM->GetMarkedSdrObj();
SdrPageView* pPV=pM->GetPageView();
const SdrGluePointList* pGPL=pObj->GetGluePointList();
- if (pGPL!=NULL) {
+ if (pGPL!=nullptr) {
sal_uInt16 nNum=pGPL->HitTest(rPnt,*pOut,pObj,bBack,bNext,nId0);
if (nNum!=SDRGLUEPOINT_NOTFOUND)
{
@@ -519,12 +519,12 @@ bool SdrMarkView::MarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const Sdr
if (!IsGluePointEditMode()) return false;
ForceUndirtyMrkPnt();
bool bChgd=false;
- if (pObj!=NULL) {
+ if (pObj!=nullptr) {
const size_t nMarkPos=TryToFindMarkedObject(pObj);
if (nMarkPos!=SAL_MAX_SIZE) {
SdrMark* pM=GetSdrMarkByIndex(nMarkPos);
SdrUShortCont* pPts=bUnmark ? pM->GetMarkedGluePoints() : pM->ForceMarkedGluePoints();
- if (pPts!=NULL) {
+ if (pPts!=nullptr) {
bool bContains = pPts->find( nId ) != pPts->end();
if (!bUnmark && !bContains) {
bChgd=true;
@@ -554,7 +554,7 @@ bool SdrMarkView::IsGluePointMarked(const SdrObject* pObj, sal_uInt16 nId) const
if (nPos!=SAL_MAX_SIZE) {
const SdrMark* pM=GetSdrMarkByIndex(nPos);
const SdrUShortCont* pPts=pM->GetMarkedGluePoints();
- if (pPts!=NULL) {
+ if (pPts!=nullptr) {
bRet = pPts->find( nId ) != pPts->end();
}
}
@@ -571,7 +571,7 @@ SdrHdl* SdrMarkView::GetGluePointHdl(const SdrObject* pObj, sal_uInt16 nId) cons
pHdl->GetKind()==HDL_GLUE &&
pHdl->GetObjHdlNum()==nId ) return pHdl;
}
- return NULL;
+ return nullptr;
}
bool SdrMarkView::MarkNextGluePoint(const Point& /*rPnt*/, bool /*bPrev*/)
generated by cgit (git 2.34.1) at 2024-07-10 06:07:53 +0000