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 /chart2 | |
| parent | clean up the SdrObjFactory create callbacks (diff) | |
| download | core-e0b61fdd35462ff679743dff1203fb5dd50e86a4.tar.gz core-e0b61fdd35462ff679743dff1203fb5dd50e86a4.zip | |
convert SdrIterMode to scoped enum
Change-Id: Iaa4631039e6b96627d8e547f21136f107e157d8a
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/controller/main/ChartController_Tools.cxx | 2 | ||||
| -rw-r--r-- | chart2/source/controller/main/ChartTransferable.cxx | 2 | ||||
| -rw-r--r-- | chart2/source/controller/main/SelectionHelper.cxx | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index 8eb20b561889..7249095f6927 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -387,7 +387,7 @@ void ChartController::impl_PasteShapes( SdrModel* pModel ) for ( sal_uInt16 i = 0; i < nCount; ++i ) { const SdrPage* pPage = pModel->GetPage( i ); - SdrObjListIter aIter( *pPage, IM_DEEPNOGROUPS ); + SdrObjListIter aIter( *pPage, SdrIterMode::DeepNoGroups ); while ( aIter.IsMore() ) { SdrObject* pObj = aIter.Next(); diff --git a/chart2/source/controller/main/ChartTransferable.cxx b/chart2/source/controller/main/ChartTransferable.cxx index 206b7adf7328..b427669a459c 100644 --- a/chart2/source/controller/main/ChartTransferable.cxx +++ b/chart2/source/controller/main/ChartTransferable.cxx @@ -122,7 +122,7 @@ bool ChartTransferable::WriteObject( tools::SvRef<SotStorageStream>& rxOStm, voi for ( sal_uInt16 i = 0; i < nCount; ++i ) { const SdrPage* pPage = pMarkedObjModel->GetPage( i ); - SdrObjListIter aIter( *pPage, IM_DEEPNOGROUPS ); + SdrObjListIter aIter( *pPage, SdrIterMode::DeepNoGroups ); while ( aIter.IsMore() ) { SdrObject* pObj = aIter.Next(); diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx index aa617af60e6c..5f3739970449 100644 --- a/chart2/source/controller/main/SelectionHelper.cxx +++ b/chart2/source/controller/main/SelectionHelper.cxx @@ -489,7 +489,7 @@ SdrObject* SelectionHelper::getMarkHandlesObject( SdrObject* pObj ) SdrObjList* pSubList = pObj->GetSubList(); if(pSubList) { - SdrObjListIter aIterator(*pSubList, IM_FLAT); + SdrObjListIter aIterator(*pSubList, SdrIterMode::Flat); while (aIterator.IsMore()) { SdrObject* pMarkHandles = SelectionHelper::getMarkHandlesObject( aIterator.Next() ); @@ -514,7 +514,7 @@ SdrObject* SelectionHelper::getObjectToMark() SdrObjList* pSubList = pObj->GetSubList(); if(pSubList) { - SdrObjListIter aIterator(*pSubList, IM_FLAT); + SdrObjListIter aIterator(*pSubList, SdrIterMode::Flat); while (aIterator.IsMore()) { SdrObject* pMarkHandles = SelectionHelper::getMarkHandlesObject( aIterator.Next() ); @@ -545,7 +545,7 @@ E3dScene* SelectionHelper::getSceneToRotate( SdrObject* pObj ) SdrObjList* pSubList = pObj->GetSubList(); if(pSubList) { - SdrObjListIter aIterator(*pSubList, IM_DEEPWITHGROUPS); + SdrObjListIter aIterator(*pSubList, SdrIterMode::DeepWithGroups); while( aIterator.IsMore() && !pRotateable ) { SdrObject* pSubObj = aIterator.Next(); @@ -634,7 +634,7 @@ bool SelectionHelper::getMarkHandles( SdrHdlList& rHdlList ) return false; } - SdrObjListIter aIterator(*pSubList, IM_FLAT); + SdrObjListIter aIterator(*pSubList, SdrIterMode::Flat); while (aIterator.IsMore()) { |