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

[Miklos Vajna]

 sw/source/core/crsr/findtxt.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 1633fb2651e32f3dab5104b11074e7904cdcbec3
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed May 20 16:56:45 2015 +0200

    SwPaM::Find: forgot to show the cursor after ending the text edit
    
    Without this, if you searched inside a shape, then got a next hit
    outside the shape, you didn't get your blinking cursor even if you
    clicked into the writer text.
    
    Change-Id: I053af9672dc9290728b16780f21301b3b840cb55

diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index 9a2a8a1..c15e5d1 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -27,7 +27,7 @@
 #include <sfx2/sfxsids.hrc>
 #include <editeng/outliner.hxx>
 
-#include <editsh.hxx>
+#include <wrtsh.hxx>
 #include <txatritr.hxx>
 #include <fldbas.hxx>
 #include <fmtfld.hxx>
@@ -294,7 +294,7 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te
             }
 
             SwDocShell *const pDocShell = pNode->GetDoc()->GetDocShell();
-            SwViewShell *const pWrtShell = (pDocShell) ? pDocShell->GetEditShell() : 0;
+            SwWrtShell *const pWrtShell = (pDocShell) ? pDocShell->GetWrtShell() : 0;
             SwPostItMgr *const pPostItMgr = (pWrtShell) ? pWrtShell->GetPostItMgr() : 0;
 
             SvxSearchItem aSearchItem(SID_SEARCH_ITEM);
@@ -311,7 +311,10 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te
                     {
                         // If not found, end the text edit.
                         pSdrView->SdrEndTextEdit();
+                        const Point aPoint(pSdrView->GetAllMarkedRect().TopLeft());
                         pSdrView->UnmarkAll();
+                        pWrtShell->SetCursor(&aPoint, true);
+                        pWrtShell->Edit();
                     }
                     else
                     {