rpms/libreoffice
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

c++11ism

Browse Source
This commit is contained in:
Caolán McNamara 2014-11-10 09:47:12 +00:00
parent db6cc9cf21
commit 609b7934db
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
0001-implement-toggling-off-removeable-master-elements-wi.patch
View File

@ -137,13 +137,13 @@ index cd643b0..6e7cb8d 100644
+ }
+ }
+
+ for (SdrObject* pObj : aPresMarksToRemove)
+ for (std::vector<SdrObject*>::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;