convert SdrIterMode to scoped enum

Change-Id: Iaa4631039e6b96627d8e547f21136f107e157d8a

12 files changed, 29 insertions, 29 deletions

diff --git a/sd/source/core/CustomAnimationCloner.cxx b/sd/source/core/CustomAnimationCloner.cxx
index b43172ad5804..6fcb46e5fb32 100644
--- a/sd/source/core/CustomAnimationCloner.cxx
+++ b/sd/source/core/CustomAnimationCloner.cxx
@@ -96,8 +96,8 @@ namespace sd
             // create a dictionary to map source to cloned shapes
             if( pSourcePage && pTargetPage )
             {
-                SdrObjListIter aSourceIter( *pSourcePage, IM_DEEPWITHGROUPS );
-                SdrObjListIter aTargetIter( *pTargetPage, IM_DEEPWITHGROUPS );
+                SdrObjListIter aSourceIter( *pSourcePage, SdrIterMode::DeepWithGroups );
+                SdrObjListIter aTargetIter( *pTargetPage, SdrIterMode::DeepWithGroups );
 
                 while( aSourceIter.IsMore() && aTargetIter.IsMore() )
                 {
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index d65ddc76ae92..9e3672570e21 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -92,7 +92,7 @@ SdrObject* SdDrawDocument::GetObj(const OUString& rObjName) const
     while (nPage < nMaxPages && !pObjFound)
     {
         pPage = static_cast<const SdPage*>( GetPage(nPage) );
-        SdrObjListIter aIter(*pPage, IM_DEEPWITHGROUPS);
+        SdrObjListIter aIter(*pPage, SdrIterMode::DeepWithGroups);
 
         while (aIter.IsMore() && !pObjFound)
         {
@@ -117,7 +117,7 @@ SdrObject* SdDrawDocument::GetObj(const OUString& rObjName) const
     while (nPage < nMaxMasterPages && !pObjFound)
     {
         pPage = static_cast<const SdPage*>( GetMasterPage(nPage) );
-        SdrObjListIter aIter(*pPage, IM_DEEPWITHGROUPS);
+        SdrObjListIter aIter(*pPage, SdrIterMode::DeepWithGroups);
 
         while (aIter.IsMore() && !pObjFound)
         {
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index ed0c55bdf306..046bb138a4b3 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -781,7 +781,7 @@ void SdDrawDocument::StartOnlineSpelling(bool bForceSpelling)
 // Fill OnlineSpelling list
 void SdDrawDocument::FillOnlineSpellingList(SdPage* pPage)
 {
-    SdrObjListIter aIter(*pPage, IM_FLAT);
+    SdrObjListIter aIter(*pPage, SdrIterMode::Flat);
 
     while (aIter.IsMore())
     {
@@ -799,7 +799,7 @@ void SdDrawDocument::FillOnlineSpellingList(SdPage* pPage)
         {
             // Found a group object
             SdrObjListIter aGroupIter(*static_cast<SdrObjGroup*>(pObj)->GetSubList(),
-                                      IM_DEEPNOGROUPS);
+                                      SdrIterMode::DeepNoGroups);
 
             bool bSubTextObjFound = false;
 
@@ -840,7 +840,7 @@ IMPL_LINK_NOARG_TYPED(SdDrawDocument, OnlineSpellingHdl, Idle *, void)
             {
                 // Found a group object
                 SdrObjListIter aGroupIter(*static_cast<SdrObjGroup*>(pObj)->GetSubList(),
-                                          IM_DEEPNOGROUPS);
+                                          SdrIterMode::DeepNoGroups);
 
 
                 while (aGroupIter.IsMore())
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index f3ca063dc0b7..bbb6598c5d9d 100644
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@ -442,8 +442,8 @@ SdrPage* SdPage::Clone(SdrModel* pNewModel) const
     cloneAnimations( *pNewPage );
 
     // fix user calls for duplicated slide
-    SdrObjListIter aSourceIter( *this, IM_DEEPWITHGROUPS );
-    SdrObjListIter aTargetIter( *pNewPage, IM_DEEPWITHGROUPS );
+    SdrObjListIter aSourceIter( *this, SdrIterMode::DeepWithGroups );
+    SdrObjListIter aTargetIter( *pNewPage, SdrIterMode::DeepWithGroups );
 
     while( aSourceIter.IsMore() && aTargetIter.IsMore() )
     {
@@ -513,7 +513,7 @@ void SdPage::getAlienAttributes( css::uno::Any& rAttributes )
 
 void SdPage::RemoveEmptyPresentationObjects()
 {
-    SdrObjListIter  aShapeIter( *this, IM_DEEPWITHGROUPS );
+    SdrObjListIter  aShapeIter( *this, SdrIterMode::DeepWithGroups );
 
     SdrObject* pShape;
     for( pShape = aShapeIter.Next(); pShape; pShape = aShapeIter.Next() )
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index c5f39da0be1e..0fe824e86a8f 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -1295,7 +1295,7 @@ void HtmlExport::WriteTable(OUStringBuffer& aStr, SdrTableObj* pTableObject, Sdr
 void HtmlExport::WriteObjectGroup(OUStringBuffer& aStr, SdrObjGroup* pObjectGroup, SdrOutliner* pOutliner,
                                   const Color& rBackgroundColor, bool bHeadLine)
 {
-    SdrObjListIter aGroupIterator(*pObjectGroup->GetSubList(), IM_DEEPNOGROUPS);
+    SdrObjListIter aGroupIterator(*pObjectGroup->GetSubList(), SdrIterMode::DeepNoGroups);
     while (aGroupIterator.IsMore())
     {
         SdrObject* pCurrentObject = aGroupIterator.Next();
@@ -1562,7 +1562,7 @@ bool HtmlExport::CreateHtmlForPresPages()
         while (!bMasterDone)
         {
             // sal_True = backwards
-            SdrObjListIter aIter(*pPage, IM_DEEPWITHGROUPS, true);
+            SdrObjListIter aIter(*pPage, SdrIterMode::DeepWithGroups, true);
 
             SdrObject* pObject = aIter.Next();
             while (pObject)
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 0c537ed3755f..ce1b85f36bfa 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -1845,7 +1845,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const bool bNewAnimations
         tAnimationVector aAnimationsOnThisPage;
 
         // add effects from page in correct order
-        SdrObjListIter aSdrIter( *pPage, IM_FLAT );
+        SdrObjListIter aSdrIter( *pPage, SdrIterMode::Flat );
         while ( aSdrIter.IsMore() )
         {
             SdrObject* pObj = aSdrIter.Next();
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 6f07464ae178..cdf627953bfe 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -354,7 +354,7 @@ static bool lcl_HasOnlyControls( SdrModel* pModel )
         SdrPage* pPage = pModel->GetPage(0);
         if (pPage)
         {
-            SdrObjListIter aIter( *pPage, IM_DEEPNOGROUPS );
+            SdrObjListIter aIter( *pPage, SdrIterMode::DeepNoGroups );
             SdrObject* pObj = aIter.Next();
             if ( pObj )
             {
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index acf5f690a45e..0f6303506eb5 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -285,7 +285,7 @@ OUString SdPageObjsTLB::getAltLongDescText(SvTreeListEntry* pEntry , bool isAltT
         const SdPage* pPage = static_cast<const SdPage*>( mpDoc->GetPage( pageNo ) );
         if( pPage->GetPageKind() != PK_STANDARD ) continue;
         if( pPage->GetName() !=  ParentName ) continue;
-        SdrObjListIter aIter( *pPage, IM_FLAT );
+        SdrObjListIter aIter( *pPage, SdrIterMode::Flat );
         while( aIter.IsMore() )
         {
             pObj = aIter.Next();
@@ -600,7 +600,7 @@ void SdPageObjsTLB::AddShapeList (
     SdrObjListIter aIter(
         rList,
         !rList.HasObjectNavigationOrder() /* use navigation order, if available */,
-        IM_FLAT);
+        SdrIterMode::Flat);
 
     bool  bMarked=false;
     if(bisInSdNavigatorWin)
@@ -838,7 +838,7 @@ bool SdPageObjsTLB::IsEqualToDoc( const SdDrawDocument* pInDoc )
             SdrObjListIter aIter(
                 *pPage,
                 !pPage->HasObjectNavigationOrder() /* use navigation order, if available */,
-                IM_DEEPWITHGROUPS );
+                SdrIterMode::DeepWithGroups );
 
             while( aIter.IsMore() )
             {
@@ -928,7 +928,7 @@ void SdPageObjsTLB::RequestingChildren( SvTreeListEntry* pFileEntry )
                                               TREELIST_APPEND,
                                               reinterpret_cast< void* >( 1 ) );
 
-                    SdrObjListIter aIter( *pPage, IM_DEEPWITHGROUPS );
+                    SdrObjListIter aIter( *pPage, SdrIterMode::DeepWithGroups );
 
                     while( aIter.IsMore() )
                     {
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index 52fa9a7f747a..7af92eac1334 100644
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -209,7 +209,7 @@ bool FuPoor::KeyInput(const KeyEvent& rKEvt)
 
                     if(pActualPage)
                     {
-                        SdrObjListIter aIter(*pActualPage, IM_DEEPNOGROUPS);
+                        SdrObjListIter aIter(*pActualPage, SdrIterMode::DeepNoGroups);
 
                         while(aIter.IsMore() && !pCandidate)
                         {
@@ -841,7 +841,7 @@ bool FuPoor::KeyInput(const KeyEvent& rKEvt)
 
                     if(pActualPage)
                     {
-                        SdrObjListIter aIter(*pActualPage, IM_DEEPNOGROUPS);
+                        SdrObjListIter aIter(*pActualPage, SdrIterMode::DeepNoGroups);
 
                         while(aIter.IsMore() && !pCandidate)
                         {
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 668325ae0add..11269c1dec0b 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -1933,7 +1933,7 @@ sal_Bool SAL_CALL SdPageLinkTargets::hasElements()
     SdPage* pPage = mpUnoPage->GetPage();
     if( pPage != nullptr )
     {
-        SdrObjListIter aIter( *pPage, IM_DEEPWITHGROUPS );
+        SdrObjListIter aIter( *pPage, SdrIterMode::DeepWithGroups );
 
         while( aIter.IsMore() )
         {
@@ -1981,7 +1981,7 @@ Sequence< OUString > SAL_CALL SdPageLinkTargets::getElementNames()
     SdPage* pPage = mpUnoPage->GetPage();
     if( pPage != nullptr )
     {
-        SdrObjListIter aIter( *pPage, IM_DEEPWITHGROUPS );
+        SdrObjListIter aIter( *pPage, SdrIterMode::DeepWithGroups );
         while( aIter.IsMore() )
         {
             SdrObject* pObj = aIter.Next();
@@ -1998,7 +1998,7 @@ Sequence< OUString > SAL_CALL SdPageLinkTargets::getElementNames()
     {
         OUString* pStr = aSeq.getArray();
 
-        SdrObjListIter aIter( *pPage, IM_DEEPWITHGROUPS );
+        SdrObjListIter aIter( *pPage, SdrIterMode::DeepWithGroups );
         while( aIter.IsMore() )
         {
             SdrObject* pObj = aIter.Next();
@@ -2027,7 +2027,7 @@ SdrObject* SdPageLinkTargets::FindObject( const OUString& rName ) const throw()
     if( pPage == nullptr )
         return nullptr;
 
-    SdrObjListIter aIter( *pPage, IM_DEEPWITHGROUPS );
+    SdrObjListIter aIter( *pPage, SdrIterMode::DeepWithGroups );
 
     while( aIter.IsMore() )
     {
diff --git a/sd/source/ui/view/OutlinerIterator.cxx b/sd/source/ui/view/OutlinerIterator.cxx
index 8a2188b46673..1eb3351f8a4d 100644
--- a/sd/source/ui/view/OutlinerIterator.cxx
+++ b/sd/source/ui/view/OutlinerIterator.cxx
@@ -575,7 +575,7 @@ IteratorImplBase* ViewIteratorImpl::Clone (IteratorImplBase* pObject) const
 
     if (mpObjectIterator != nullptr)
     {
-        pIterator->mpObjectIterator = new SdrObjListIter(*mpPage, IM_DEEPNOGROUPS, !mbDirectionIsForward);
+        pIterator->mpObjectIterator = new SdrObjListIter(*mpPage, SdrIterMode::DeepNoGroups, !mbDirectionIsForward);
 
         // No direct way to set the object iterator to the current object.
         pIterator->maPosition.mxObject.reset(nullptr);
@@ -620,7 +620,7 @@ void ViewIteratorImpl::GotoNextText()
             SetPage (maPosition.mnPageIndex-1);
 
         if (mpPage != nullptr)
-            mpObjectIterator = new SdrObjListIter(*mpPage, IM_DEEPNOGROUPS, !mbDirectionIsForward);
+            mpObjectIterator = new SdrObjListIter(*mpPage, SdrIterMode::DeepNoGroups, !mbDirectionIsForward);
         if (mpObjectIterator!=nullptr && mpObjectIterator->IsMore())
             maPosition.mxObject.reset(mpObjectIterator->Next());
         else
@@ -672,7 +672,7 @@ void ViewIteratorImpl::SetPage (sal_Int32 nPageIndex)
 
     // Set up object list iterator.
     if (mpPage != nullptr)
-        mpObjectIterator = new SdrObjListIter(*mpPage, IM_DEEPNOGROUPS, ! mbDirectionIsForward);
+        mpObjectIterator = new SdrObjListIter(*mpPage, SdrIterMode::DeepNoGroups, ! mbDirectionIsForward);
     else
         mpObjectIterator = nullptr;
 
@@ -700,7 +700,7 @@ void ViewIteratorImpl::Reverse()
     if (mpObjectIterator != nullptr)
         delete mpObjectIterator;
     if (mpPage != nullptr)
-        mpObjectIterator = new SdrObjListIter(*mpPage, IM_DEEPNOGROUPS, ! mbDirectionIsForward);
+        mpObjectIterator = new SdrObjListIter(*mpPage, SdrIterMode::DeepNoGroups, ! mbDirectionIsForward);
     else
         mpObjectIterator = nullptr;
 
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index c390ffaf244e..dc4091eefa62 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -147,7 +147,7 @@ bool DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin)
                 GetView()->SdrEndTextEdit();
 
                 // look for a new candidate, a successor of pOldObj
-                SdrObjListIter aIter(*pActualPage, IM_DEEPNOGROUPS);
+                SdrObjListIter aIter(*pActualPage, SdrIterMode::DeepNoGroups);
                 bool bDidVisitOldObject(false);
 
                 while(aIter.IsMore() && !pCandidate)