diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-03-17 08:33:51 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-03-17 08:34:21 +0100 |
| commit | 8e0b08c3053ed5472409b1ea7e02653aad38f7d6 (patch) | |
| tree | 7f9160cfd5b97efafc3fe00dea9e0f8a10e120d8 /include | |
| parent | 5b3fee11f4019820cc1212a0441020609418dbf1 (diff) | |
tdf#98458 sw: make search in shape text optional
Instead of forcing it silently on everyone, add a new search option and
enable it only in case it's requested, as shape search is expensive for
large documents.
(Regression from commit bdc1824ea7acfa2fe9d71cdbe57882acce155577.)
Change-Id: Ibb6e76ad5c870dfd63b36429e16ef6d572f5f1fd
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/msg.hxx | 2 | ||||
| -rw-r--r-- | include/svl/memberid.hrc | 1 | ||||
| -rw-r--r-- | include/svl/srchitem.hxx | 4 |
3 files changed, 6 insertions, 1 deletions
diff --git a/include/sfx2/msg.hxx b/include/sfx2/msg.hxx index 6753181644a9..03972d5f27ca 100644 --- a/include/sfx2/msg.hxx +++ b/include/sfx2/msg.hxx @@ -146,7 +146,7 @@ SFX_DECL_TYPE(13); // for SwAddPrinterItem, Sd... SFX_DECL_TYPE(14); SFX_DECL_TYPE(16); // for SwDocDisplayItem SFX_DECL_TYPE(17); // for SvxAddressItem -SFX_DECL_TYPE(23); // for SvxSearchItem +SFX_DECL_TYPE(24); // for SvxSearchItem // all SfxTypes must be in this header #undef SFX_DECL_TYPE diff --git a/include/svl/memberid.hrc b/include/svl/memberid.hrc index b5a2262958e5..fb467b3f22d1 100644 --- a/include/svl/memberid.hrc +++ b/include/svl/memberid.hrc @@ -61,6 +61,7 @@ #define MID_SEARCH_STARTPOINTY 21 #define MID_SEARCH_SEARCHFORMATTED 22 #define MID_SEARCH_ALGORITHMTYPE2 23 +#define MID_SEARCH_INSHAPES 24 #endif diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx index 472f1ac3dd61..d67fff89819e 100644 --- a/include/svl/srchitem.hxx +++ b/include/svl/srchitem.hxx @@ -90,6 +90,9 @@ class SVL_DLLPUBLIC SvxSearchItem : sal_Int32 m_nStartPointX; sal_Int32 m_nStartPointY; + /// Writer-specific: search in shape text. + bool m_bSearchInShapes; + virtual void ImplCommit() override; public: @@ -198,6 +201,7 @@ public: sal_Int32 GetStartPointY() const; /// Either x or y start point is set. bool HasStartPoint() const; + bool IsSearchInShapes() const; }; const OUString& SvxSearchItem::GetSearchString() const |