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

sw: avoid hang with find-all and shape text

We can't easily have editeng & sw selection at the same time, so just
exlucde shapes in the find-all case for now: better than a hang.

Change-Id: I1090595e8c4bc11eb38ffa486885ad5fab67ab86
üst 27728cc5
......@@ -638,6 +638,7 @@ public:
SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const SAL_OVERRIDE;
SAL_DLLPRIVATE virtual VclPtr<SfxTabPage> CreatePrintOptionsPage( vcl::Window* pParent,
const SfxItemSet& rSet) SAL_OVERRIDE;
static SvxSearchItem* GetSearchItem() { return m_pSrchItem; }
};
inline long SwView::GetXScroll() const
......
......@@ -49,6 +49,7 @@
#include <docsh.hxx>
#include <PostItMgr.hxx>
#include <viewsh.hxx>
#include <view.hxx>
using namespace ::com::sun::star;
using namespace util;
......@@ -342,8 +343,10 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te
}
}
// Writer and editeng selections are not supported in parallel.
SvxSearchItem* pSearchItem = SwView::GetSearchItem();
// If we just finished search in shape text, don't attempt to do that again.
if (!bEndedTextEdit)
if (!bEndedTextEdit && !(pSearchItem && pSearchItem->GetCommand() == SvxSearchCmd::FIND_ALL))
{
// If there are any shapes anchored to this node, search there.
SwPaM aPaM(pNode->GetDoc()->GetNodes().GetEndOfContent());
......
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