[Libreoffice-commits] core.git: sw/source

[Michael Stahl]

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

New commits:
commit 2eef912649d277e05203bc79c26f2be5b096a292
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Feb 18 22:29:56 2013 +0100

    SwXTextView::select(): unselect drawing objects at start...
    
    ... 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

diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index b8ae23d..8bb9b5f 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;
             }