diff options
| author | Armin Le Grand <alg@apache.org> | 2014-04-28 16:57:14 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-04-29 10:16:36 +0100 |
| commit | e34c437d2e98753159c9bd82516386143d707d93 (patch) | |
| tree | 848ec06f62aaff84ba4a26d14df04d4f24dcd785 /svx | |
| parent | d46e7dabd3090697c46e24a350cc75f35c28a8f7 (diff) | |
Resolves: #i124760# ensure that only the created object is selected
(cherry picked from commit b6189665e0143d68cf2fe225eca77bcf0454a107)
Conflicts:
svx/source/svdraw/svdedtv2.cxx
Change-Id: I4ebf95a5c42fd2348dbb79f99881217a74301197
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdedtv2.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
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); } |