Kaydet (Commit) aa109e6a authored tarafından Matteo Casalin's avatar Matteo Casalin

Share common code

Change-Id: Ia6ee42c799e566ad837e89d6456c50c7217da1eb
üst 828a7ffd
......@@ -162,6 +162,7 @@ protected:
bool MarkGluePoints(const tools::Rectangle* pRect, bool bUnmark);
void SetMoveOutside(bool bOn);
bool MarkableObjectsExceed( int n ) const;
protected:
// #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView
......@@ -200,7 +201,7 @@ public:
bool IsFrameHandles() const { return mbForceFrameHandles; }
// returns true if number of markable objects is greater than 1
bool HasMultipleMarkableObjects() const;
bool HasMultipleMarkableObjects() const { return MarkableObjectsExceed(1); };
void SetEditMode(SdrViewEditMode eMode);
SdrViewEditMode GetEditMode() const { return meEditMode; }
......@@ -218,7 +219,7 @@ public:
void SetFrameDragSingles(bool bOn=true) { SetFrameHandles(bOn); }
bool IsFrameDragSingles() const { return IsFrameHandles(); }
bool HasMarkableObj() const;
bool HasMarkableObj() const { return MarkableObjectsExceed(0); };
// migrate selections
......
......@@ -522,41 +522,23 @@ void SdrMarkView::BrkMarkGluePoints()
}
}
bool SdrMarkView::HasMultipleMarkableObjects() const
bool SdrMarkView::MarkableObjectsExceed( int n ) const
{
SdrPageView* pPV = GetSdrPageView();
if (!pPV)
return false;
int nCount=0;
SdrObjList* pOL=pPV->GetObjList();
const size_t nObjCount = pOL->GetObjCount();
for (size_t nObjNum=0; nObjNum<nObjCount; ++nObjNum) {
SdrObject* pObj=pOL->GetObj(nObjNum);
if (IsObjMarkable(pObj,pPV) && ++nCount>1)
if (IsObjMarkable(pObj,pPV) && --n<0)
return true;
}
return false;
}
bool SdrMarkView::HasMarkableObj() const
{
SdrPageView* pPV = GetSdrPageView();
if(pPV)
{
SdrObjList* pOL=pPV->GetObjList();
const size_t nObjCount = pOL->GetObjCount();
for (size_t nObjNum = 0; nObjNum<nObjCount; ++nObjNum) {
SdrObject* pObj=pOL->GetObj(nObjNum);
if (IsObjMarkable(pObj,pPV)) {
return true;
}
}
}
return false;
}
void SdrMarkView::hideMarkHandles()
{
if(!mbMarkHandlesHidden)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment