From 609b7934db5eddbdd03362a8edabc01b9c258beb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Mon, 10 Nov 2014 09:47:12 +0000 Subject: [PATCH] c++11ism --- ...ement-toggling-off-removeable-master-elements-wi.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/0001-implement-toggling-off-removeable-master-elements-wi.patch b/0001-implement-toggling-off-removeable-master-elements-wi.patch index 17459de..0a5d8bc 100644 --- a/0001-implement-toggling-off-removeable-master-elements-wi.patch +++ b/0001-implement-toggling-off-removeable-master-elements-wi.patch @@ -137,13 +137,13 @@ index cd643b0..6e7cb8d 100644 + } + } + -+ for (SdrObject* pObj : aPresMarksToRemove) ++ for (std::vector::iterator aI = aPresMarksToRemove.begin(); aI < aPresMarksToRemove.end(); ++aI) + { + //Unmark object -+ mpDrawView->MarkObj(pObj, mpDrawView->GetSdrPageView(), true); -+ SdPage* pPage = (SdPage*)pObj->GetPage(); ++ mpDrawView->MarkObj((*aI), mpDrawView->GetSdrPageView(), true); ++ SdPage* pPage = (SdPage*)(*aI)->GetPage(); + //remove placeholder from master page -+ pPage->DestroyDefaultPresObj(pPage->GetPresObjKind(pObj)); ++ pPage->DestroyDefaultPresObj(pPage->GetPresObjKind((*aI))); + } + + bConsumed = true;