diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-05-18 16:27:14 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-05-18 16:45:23 +0200 |
| commit | 07355d267013ad2ea31479d4d745fbc8f88e232e (patch) | |
| tree | 297a4f58176824c61458d9a11ec7ff00172b5110 | |
| parent | 29cfe8252748c46605537ac67c4ec326d0bb03f7 (diff) | |
SwPaM::Find: if there is an active text edit, then search there
Change-Id: Ic5d81aa1faca8f2190f87fc51eccdd7695d2c0ef
| -rw-r--r-- | sw/source/core/crsr/findtxt.cxx | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx index 1d0c30e78af4..dd1edd2a60f3 100644 --- a/sw/source/core/crsr/findtxt.cxx +++ b/sw/source/core/crsr/findtxt.cxx @@ -22,6 +22,10 @@ #include <comphelper/string.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> +#include <svx/svdview.hxx> +#include <svl/srchitem.hxx> +#include <sfx2/sfxsids.hrc> +#include <editeng/outliner.hxx> #include <editsh.hxx> #include <txatritr.hxx> @@ -291,6 +295,26 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te SwViewShell *const pWrtShell = (pDocShell) ? pDocShell->GetEditShell() : 0; SwPostItMgr *const pPostItMgr = (pWrtShell) ? pWrtShell->GetPostItMgr() : 0; + // If there is an active text edit, then search there. + if (SdrView* pSdrView = pWrtShell->GetDrawView()) + { + if (pSdrView->GetTextEditObject()) + { + SvxSearchItem aSearchItem(SID_SEARCH_ITEM); + aSearchItem.SetSearchOptions(rSearchOpt); + aSearchItem.SetBackward(!bSrchForward); + sal_uInt16 nResult = pSdrView->GetTextEditOutlinerView()->StartSearchAndReplace(aSearchItem); + if (!nResult) + // If not found, end the text edit. + pSdrView->SdrEndTextEdit(); + else + { + bFound = true; + break; + } + } + } + sal_Int32 aStart = 0; // do we need to finish a note? if (pPostItMgr && pPostItMgr->HasActiveSidebarWin()) |