GetMarkedObjectCount() -> GetMarkedObjectList().GetMarkCount()

In order to reduce number of calls to GetMarkedObjectList() later on

Change-Id: Id94f66545950f0fdf124ba7b985a5215a01d63fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168213
Tested-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>

5 files changed, 13 insertions, 13 deletions

diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx
index 23c4dd61872d..d56fc7b458d5 100644
--- a/sw/source/uibase/shells/drawsh.cxx
+++ b/sw/source/uibase/shells/drawsh.cxx
@@ -81,7 +81,7 @@ SdrObject* SwDrawShell::IsSingleFillableNonOLESelected()
         return nullptr;
     }
 
-    if(1 != pSdrView->GetMarkedObjectCount())
+    if(1 != pSdrView->GetMarkedObjectList().GetMarkCount())
     {
         return nullptr;
     }
diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx
index 01673532ecbd..070354432bda 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -604,7 +604,7 @@ void SwDrawBaseShell::Execute(SfxRequest& rReq)
         {
             bDone = true;
 
-            if(1 == pSdrView->GetMarkedObjectCount())
+            if(1 == pSdrView->GetMarkedObjectList().GetMarkCount())
             {
                 // #i68101#
                 rtl::Reference<SdrObject> pSelected = pSdrView->GetMarkedObjectByIndex(0);
@@ -649,7 +649,7 @@ void SwDrawBaseShell::Execute(SfxRequest& rReq)
         {
             bDone = true;
 
-            if(1 == pSdrView->GetMarkedObjectCount())
+            if(1 == pSdrView->GetMarkedObjectList().GetMarkCount())
             {
                 rtl::Reference<SdrObject> pSelected = pSdrView->GetMarkedObjectByIndex(0);
                 assert(pSelected && "DrawViewShell::FuTemp03: nMarkCount, but no object (!)");
@@ -909,7 +909,7 @@ void SwDrawBaseShell::GetState(SfxItemSet& rSet)
 
             case FN_NAME_SHAPE :
                 {
-                    if(1 != pSdrView->GetMarkedObjectCount())
+                    if(1 != pSdrView->GetMarkedObjectList().GetMarkCount())
                     {
                         rSet.DisableItem( nWhich );
                     }
@@ -921,7 +921,7 @@ void SwDrawBaseShell::GetState(SfxItemSet& rSet)
                 {
                     const bool bIsWebView(nullptr != dynamic_cast<SwWebView*>(&GetView()));
 
-                    if(!bIsWebView && 1 != pSdrView->GetMarkedObjectCount())
+                    if(!bIsWebView && 1 != pSdrView->GetMarkedObjectList().GetMarkCount())
                     {
                         rSet.DisableItem( nWhich );
                     }
@@ -934,7 +934,7 @@ void SwDrawBaseShell::GetState(SfxItemSet& rSet)
             case SID_REMOVE_HYPERLINK:
             case SID_COPY_HYPERLINK_LOCATION:
             {
-                if (pSdrView->GetMarkedObjectCount() != 1)
+                if (pSdrView->GetMarkedObjectList().GetMarkCount() != 1)
                 {
                     rSet.DisableItem(nWhich);
                     break;
diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx
index 2785f7133031..605475cc935e 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -658,7 +658,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
             bUpdateMgr = false;
             SdrView* pSdrView = rSh.GetDrawViewWithValidMarkList();
             if ( pSdrView &&
-                 pSdrView->GetMarkedObjectCount() == 1 )
+                 pSdrView->GetMarkedObjectList().GetMarkCount() == 1 )
             {
                 OUString aName(rSh.GetFlyName());
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
@@ -682,7 +682,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
             bUpdateMgr = false;
             SdrView* pSdrView = rSh.GetDrawViewWithValidMarkList();
             if ( pSdrView &&
-                 pSdrView->GetMarkedObjectCount() == 1 )
+                 pSdrView->GetMarkedObjectList().GetMarkCount() == 1 )
             {
                 OUString aDescription(rSh.GetObjDescription());
                 OUString aTitle(rSh.GetObjTitle());
@@ -1022,7 +1022,7 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
                 SwWrtShell &rWrtSh = GetShell();
                 SdrView* pSdrView = rWrtSh.GetDrawViewWithValidMarkList();
                 if ( !pSdrView ||
-                     pSdrView->GetMarkedObjectCount() != 1 )
+                     pSdrView->GetMarkedObjectList().GetMarkCount() != 1 )
                 {
                     rSet.DisableItem( nWhich );
                 }
diff --git a/sw/source/uibase/uiview/viewdlg2.cxx b/sw/source/uibase/uiview/viewdlg2.cxx
index 7d78b693dfaa..0f3019e58412 100644
--- a/sw/source/uibase/uiview/viewdlg2.cxx
+++ b/sw/source/uibase/uiview/viewdlg2.cxx
@@ -155,7 +155,7 @@ bool SwView::isSignatureLineSelected() const
     if (!pSdrView)
         return false;
 
-    if (pSdrView->GetMarkedObjectCount() != 1)
+    if (pSdrView->GetMarkedObjectList().GetMarkCount() != 1)
         return false;
 
     SdrObject* pPickObj = pSdrView->GetMarkedObjectByIndex(0);
@@ -176,7 +176,7 @@ bool SwView::isSignatureLineSigned() const
     if (!pSdrView)
         return false;
 
-    if (pSdrView->GetMarkedObjectCount() != 1)
+    if (pSdrView->GetMarkedObjectList().GetMarkCount() != 1)
         return false;
 
     SdrObject* pPickObj = pSdrView->GetMarkedObjectByIndex(0);
@@ -197,7 +197,7 @@ bool SwView::isQRCodeSelected() const
     if (!pSdrView)
         return false;
 
-    if (pSdrView->GetMarkedObjectCount() != 1)
+    if (pSdrView->GetMarkedObjectList().GetMarkCount() != 1)
         return false;
 
     SdrObject* pPickObj = pSdrView->GetMarkedObjectByIndex(0);
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index d044b611eb59..78177a9e226c 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -4317,7 +4317,7 @@ void SwContentTree::UpdateTracking()
                 SdrView* pSdrView = m_pActiveShell->GetDrawView();
                 if (pSdrView)
                 {
-                    for (size_t nIdx(0); nIdx < pSdrView->GetMarkedObjectCount(); nIdx++)
+                    for (size_t nIdx(0); nIdx < pSdrView->GetMarkedObjectList().GetMarkCount(); nIdx++)
                     {
                         SdrObject* pSelected = pSdrView->GetMarkedObjectByIndex(nIdx);
                         OUString aName(pSelected->GetName());