From e34c437d2e98753159c9bd82516386143d707d93 Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Mon, 28 Apr 2014 16:57:14 +0000 Subject: Resolves: #i124760# ensure that only the created object is selected (cherry picked from commit b6189665e0143d68cf2fe225eca77bcf0454a107) Conflicts: svx/source/svdraw/svdedtv2.cxx Change-Id: I4ebf95a5c42fd2348dbb79f99881217a74301197 --- svx/source/svdraw/svdedtv2.cxx | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'svx') diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index 055e3f05f834..056947cbdf7a 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -1136,6 +1136,12 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode) pInsOL->InsertObject(pPath, nInsPos, &aReason); if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath)); + + // #i124760# To have a correct selection with only the new object it is necessary to + // unmark all objects first. If not doing so, there may remain invalid pointers to objects + //TTTT:Not needed for aw080 (!) + UnmarkAllObj(pInsPV); + MarkObj(pPath, pInsPV, false, true); } -- cgit