From 2eef912649d277e05203bc79c26f2be5b096a292 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Mon, 18 Feb 2013 22:29:56 +0100
Subject: SwXTextView::select(): unselect drawing objects at start...
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

... and not before selecting each object, which leaves only the last
object selected (thanks Németh László for the hint).
(regression from abebf10e2681181cff45deabacfc9b2929d52631)

Change-Id: Ibfb13ae6c4eeeb83bf6ac00b18c4ef6f50ec6a02
---
 sw/source/ui/uno/unotxvw.cxx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'sw/source/ui/uno')

diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index b8ae23d0725f..8bb9b5fcb11f 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -310,14 +310,15 @@ sal_Bool SwXTextView::select(const uno::Any& aInterface) throw( lang::IllegalArg
         SdrView *const pDrawView = rSh.GetDrawView();
         SdrPageView *const pPV = pDrawView->GetSdrPageView();
 
+        pDrawView->SdrEndTextEdit();
+        pDrawView->UnmarkAll();
+
         for (size_t i = 0; i < sdrObjects.size(); ++i)
         {
             SdrObject *const pSdrObject(sdrObjects[i]);
             // GetSelectableFromAny did not check pSdrObject is in right doc!
             if (pPV && pSdrObject->GetPage() == pPV->GetPage())
             {
-                pDrawView->SdrEndTextEdit();
-                pDrawView->UnmarkAll();
                 pDrawView->MarkObj(pSdrObject, pPV);
                 bRet = sal_True;
             }
-- 
cgit