GetMarkableObjCount() is only compared against 1

Change-Id: I390b260fe481c7db73a065dd271c78a5df188ccc

include/svx/svdmrkv.hxx

@@ -199,7 +199,8 @@ public:
     void SetFrameHandles(bool bOn);
     bool IsFrameHandles() const { return mbForceFrameHandles; }
 
-    sal_uIntPtr GetMarkableObjCount() const;
+    // returns true if number of markable objects is greater than 1
+    bool HasMultipleMarkableObjects() const;
 
     void SetEditMode(SdrViewEditMode eMode);
     SdrViewEditMode GetEditMode() const { return meEditMode; }

sc/source/ui/drawfunc/fudraw.cxx

@@ -271,7 +271,7 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt)
                     if(!pView->MarkNextObj( !aCode.IsShift() ))
                     {
                         //If there is only one object, don't do the UnmarkAllObj() & MarkNextObj().
-                        if ( pView->GetMarkableObjCount() > 1 && pView->HasMarkableObj() )
+                        if ( pView->HasMultipleMarkableObjects() && pView->HasMarkableObj() )
                         {
                             // No next object: go over open end and
                             // get first from the other side

sd/source/ui/func/fudraw.cxx

@@ -372,7 +372,7 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt)
                 if(!mpView->MarkNextObj( !aCode.IsShift() ))
                 {
                     //If there is only one object, don't do the UnmarkAllObj() & MarkNextObj().
-                    if ( mpView->GetMarkableObjCount() > 1 && mpView->AreObjectsMarked() )
+                    if ( mpView->HasMultipleMarkableObjects() && mpView->AreObjectsMarked() )
                     {
                         // No next object: go over open end and get first from
                         // the other side

svx/source/svdraw/svdmrkv.cxx

@@ -522,23 +522,22 @@ void SdrMarkView::BrkMarkGluePoints()
     }
 }
 
-sal_uIntPtr SdrMarkView::GetMarkableObjCount() const
+bool SdrMarkView::HasMultipleMarkableObjects() const
 {
-    sal_uIntPtr nCount=0;
     SdrPageView* pPV = GetSdrPageView();
+    if (!pPV)
+        return false;
 
-    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)) {
-                nCount++;
-            }
-        }
+    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)
+            return true;
     }
-    return nCount;
+
+    return false;
 }
 
 bool SdrMarkView::HasMarkableObj() const