[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svx/source

[Armin Le Grand]

 svx/source/svdraw/svdedtv2.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit b6189665e0143d68cf2fe225eca77bcf0454a107
Author: Armin Le Grand <alg at apache.org>
Date:   Mon Apr 28 16:57:14 2014 +0000

    i124760 ensure that only the created object is selected

diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index 89e4d26..212e84e 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -1164,6 +1164,12 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode)
             pInsOL->InsertObject(pPath, nInsPos, &aReason);
             if( bUndo )
                 AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath));
+
+            // #124760# 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, sal_False, sal_True);
         }