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 /reportdesign/source | |
| parent | ba263e124ce263c3c893542062d9c473f5aae589 (diff) | |
convert SdrIterMode to scoped enum
Change-Id: Iaa4631039e6b96627d8e547f21136f107e157d8a
Diffstat (limited to 'reportdesign/source')
| -rw-r--r-- | reportdesign/source/ui/misc/UITools.cxx | 4 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/ReportSection.cxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/dlgedfunc.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 773a7ce5fe41..101b30173c7f 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -844,7 +844,7 @@ void notifySystemWindow(vcl::Window* _pWindow, vcl::Window* _pToRegister, const SdrObject* isOver(const Rectangle& _rRect, SdrPage& _rPage, SdrView& _rView, bool _bAllObjects, SdrObject* _pIgnore, sal_Int16 _nIgnoreType) { SdrObject* pOverlappedObj = nullptr; - SdrObjListIter aIter(_rPage,IM_DEEPNOGROUPS); + SdrObjListIter aIter(_rPage,SdrIterMode::DeepNoGroups); SdrObject* pObjIter = nullptr; while( !pOverlappedObj && (pObjIter = aIter.Next()) != nullptr ) @@ -885,7 +885,7 @@ bool checkArrayForOccurrence(SdrObject* _pObjToCheck, SdrUnoObj* _pIgnore[], int SdrObject* isOver(const Rectangle& _rRect,SdrPage& _rPage,SdrView& _rView,bool _bAllObjects, SdrUnoObj * _pIgnoreList[], int _nIgnoreListLength) { SdrObject* pOverlappedObj = nullptr; - SdrObjListIter aIter(_rPage,IM_DEEPNOGROUPS); + SdrObjListIter aIter(_rPage,SdrIterMode::DeepNoGroups); SdrObject* pObjIter = nullptr; while( !pOverlappedObj && (pObjIter = aIter.Next()) != nullptr ) diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index b2b2f8871444..07c604f43971 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -417,7 +417,7 @@ void OReportSection::SelectAll(const sal_uInt16 _nObjectType) else { m_pView->UnmarkAll(); - SdrObjListIter aIter(*m_pPage,IM_DEEPNOGROUPS); + SdrObjListIter aIter(*m_pPage,SdrIterMode::DeepNoGroups); SdrObject* pObjIter = nullptr; while( (pObjIter = aIter.Next()) != nullptr ) { diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx index cf583d73b4e5..d6603e299103 100644 --- a/reportdesign/source/ui/report/dlgedfunc.cxx +++ b/reportdesign/source/ui/report/dlgedfunc.cxx @@ -577,7 +577,7 @@ bool DlgEdFunc::isRectangleHit(const MouseEvent& rMEvt) const SdrDragStat& rDragStat = m_rView.GetDragStat(); if (rDragStat.GetDragMethod() != nullptr) { - SdrObjListIter aIter(*m_pParent->getPage(),IM_DEEPNOGROUPS); + SdrObjListIter aIter(*m_pParent->getPage(),SdrIterMode::DeepNoGroups); SdrObject* pObjIter = nullptr; // loop through all marked objects and check if there new rect overlapps an old one. while( (pObjIter = aIter.Next()) != nullptr && !bIsSetPoint) |