diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-12-02 16:00:10 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2014-06-10 16:33:56 +0100 |
| commit | 9a4df93cc6267f5e9a341445358bba1a6ba3260b (patch) | |
| tree | 31df57f0f58696b21d553f6b358f23261cc856e6 | |
| parent | e0d2fd8fb173728c8485ef7f4baa129ed044df94 (diff) | |
restore SdrMarkView::HasMarkableObj, etc.
Change-Id: Ib5c0d5028792708bc0ac0e756aa47d486443bbb7
| -rw-r--r-- | include/svx/svdmrkv.hxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdmrkv.cxx | 19 |
2 files changed, 21 insertions, 0 deletions
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index 64a7ffbd717a..ecf2b207a1a4 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -228,6 +228,8 @@ public: void SetFrameDragSingles(sal_Bool bOn=sal_True) { SetFrameHandles(bOn); } sal_Bool IsFrameDragSingles() const { return IsFrameHandles(); } + sal_Bool HasMarkableObj() const; + //////////////////////////////////////////////////////////////////////////////////////////////////// // migrate selections diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 4b85b92065f0..b63131aadc9b 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -519,6 +519,25 @@ sal_uIntPtr SdrMarkView::GetMarkableObjCount() const return nCount; } +sal_Bool SdrMarkView::HasMarkableObj() const +{ + sal_uIntPtr nCount=0; + + SdrPageView* pPV = GetSdrPageView(); + if(pPV) + { + SdrObjList* pOL=pPV->GetObjList(); + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + for (sal_uIntPtr nObjNum=0; nObjNum<nObjAnz && nCount==0; nObjNum++) { + SdrObject* pObj=pOL->GetObj(nObjNum); + if (IsObjMarkable(pObj,pPV)) { + nCount++; + } + } + } + return nCount!=0; +} + void SdrMarkView::hideMarkHandles() { if(!mbMarkHandlesHidden) |