diff options
author | Noel Grandin <noel@peralex.com> | 2016-08-22 11:19:52 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-08-23 09:54:16 +0200 |
commit | e0b61fdd35462ff679743dff1203fb5dd50e86a4 (patch) | |
tree | 46720d942ff6c656da2b79204294469510591d69 /sw | |
parent | ba263e124ce263c3c893542062d9c473f5aae589 (diff) |
convert SdrIterMode to scoped enum
Change-Id: Iaa4631039e6b96627d8e547f21136f107e157d8a
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/doc/docdraw.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/draw/dcontact.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/frmedt/feshview.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/unocore/unodraw.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/dochdl/swdtflvr.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/shells/drwbassh.cxx | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx index 00ddcb8571c8..620996fd702c 100644 --- a/sw/source/core/doc/docdraw.cxx +++ b/sw/source/core/doc/docdraw.cxx @@ -603,7 +603,7 @@ namespace docfunc { const SdrPage& rSdrPage( *(p_rDoc.getIDocumentDrawModelAccess().GetDrawModel()->GetPage( 0 )) ); - SdrObjListIter aIter( rSdrPage, IM_FLAT ); + SdrObjListIter aIter( rSdrPage, SdrIterMode::Flat ); while( aIter.IsMore() ) { SdrObject* pObj( aIter.Next() ); @@ -628,7 +628,7 @@ namespace docfunc { const SdrPage& rSdrPage( *(p_rDoc.getIDocumentDrawModelAccess().GetDrawModel()->GetPage( 0 )) ); - SdrObjListIter aIter( rSdrPage, IM_FLAT ); + SdrObjListIter aIter( rSdrPage, SdrIterMode::Flat ); while( aIter.IsMore() ) { SdrObject* pObj( aIter.Next() ); diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index f4c58c47f6e3..a202c566c6c6 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -639,7 +639,7 @@ void SwDrawContact::GetTextObjectsFromFormat( std::list<SdrTextObj*>& rTextObjec { if ( dynamic_cast<const SdrObjGroup*>(pSdrO) != nullptr ) { - SdrObjListIter aListIter( *pSdrO, IM_DEEPNOGROUPS ); + SdrObjListIter aListIter( *pSdrO, SdrIterMode::DeepNoGroups ); //iterate inside of a grouped object while( aListIter.IsMore() ) { diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index 50369c909715..d090efd4b726 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -1332,7 +1332,7 @@ const SdrObject* SwFEShell::GetBestObject( bool bNext, GotoObjFlags eType, bool OSL_ENSURE( pList, "No object list to iterate" ); - SdrObjListIter aObjIter( *pList, bFlat ? IM_FLAT : IM_DEEPNOGROUPS ); + SdrObjListIter aObjIter( *pList, bFlat ? SdrIterMode::Flat : SdrIterMode::DeepNoGroups ); while ( aObjIter.IsMore() ) { SdrObject* pObj = aObjIter.Next(); @@ -1382,7 +1382,7 @@ const SdrObject* SwFEShell::GetBestObject( bool bNext, GotoObjFlags eType, bool (aCurPos.getX() < aPos.getX())) ) // " reverse { aBestPos = Point( nTmp, nTmp ); - SdrObjListIter aTmpIter( *pList, bFlat ? IM_FLAT : IM_DEEPNOGROUPS ); + SdrObjListIter aTmpIter( *pList, bFlat ? SdrIterMode::Flat : SdrIterMode::DeepNoGroups ); while ( aTmpIter.IsMore() ) { SdrObject* pTmpObj = aTmpIter.Next(); diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 977e95bcc9e0..b608315d90ce 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -963,7 +963,7 @@ SwXShape::SwXShape(uno::Reference< uno::XInterface > & xShape) : void SwXShape::AddExistingShapeToFormat( SdrObject& _rObj ) { - SdrObjListIter aIter( _rObj, IM_DEEPNOGROUPS ); + SdrObjListIter aIter( _rObj, SdrIterMode::DeepNoGroups ); while ( aIter.IsMore() ) { SdrObject* pCurrent = aIter.Next(); diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index ca7e34774ac8..288144bc90fb 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -640,7 +640,7 @@ bool SwTransferable::WriteObject( tools::SvRef<SotStorageStream>& xStream, for(sal_uInt16 a(0); a < pModel->GetPageCount(); a++) { const SdrPage* pPage = pModel->GetPage(a); - SdrObjListIter aIter(*pPage, IM_DEEPNOGROUPS); + SdrObjListIter aIter(*pPage, SdrIterMode::DeepNoGroups); while(aIter.IsMore()) { diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx index c937cc6582cc..30ccc404d51b 100644 --- a/sw/source/uibase/shells/drwbassh.cxx +++ b/sw/source/uibase/shells/drwbassh.cxx @@ -604,7 +604,7 @@ IMPL_LINK_TYPED( SwDrawBaseShell, CheckGroupShapeNameHdl, AbstractSvxObjectNameD { bRet = true; SwDrawModel* pModel = rSh.getIDocumentDrawModelAccess().GetDrawModel(); - SdrObjListIter aIter( *(pModel->GetPage(0)), IM_DEEPWITHGROUPS ); + SdrObjListIter aIter( *(pModel->GetPage(0)), SdrIterMode::DeepWithGroups ); while( aIter.IsMore() ) { SdrObject* pTempObj = aIter.Next(); |