Kaydet (Commit) 1633fb26 authored tarafından Miklos Vajna's avatar Miklos Vajna

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
üst 9947af03
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include <sfx2/sfxsids.hrc> #include <sfx2/sfxsids.hrc>
#include <editeng/outliner.hxx> #include <editeng/outliner.hxx>
#include <editsh.hxx> #include <wrtsh.hxx>
#include <txatritr.hxx> #include <txatritr.hxx>
#include <fldbas.hxx> #include <fldbas.hxx>
#include <fmtfld.hxx> #include <fmtfld.hxx>
...@@ -294,7 +294,7 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te ...@@ -294,7 +294,7 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te
} }
SwDocShell *const pDocShell = pNode->GetDoc()->GetDocShell(); 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; SwPostItMgr *const pPostItMgr = (pWrtShell) ? pWrtShell->GetPostItMgr() : 0;
SvxSearchItem aSearchItem(SID_SEARCH_ITEM); SvxSearchItem aSearchItem(SID_SEARCH_ITEM);
...@@ -311,7 +311,10 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te ...@@ -311,7 +311,10 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te
{ {
// If not found, end the text edit. // If not found, end the text edit.
pSdrView->SdrEndTextEdit(); pSdrView->SdrEndTextEdit();
const Point aPoint(pSdrView->GetAllMarkedRect().TopLeft());
pSdrView->UnmarkAll(); pSdrView->UnmarkAll();
pWrtShell->SetCursor(&aPoint, true);
pWrtShell->Edit();
} }
else else
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment