diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2016-03-17 15:43:32 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2016-03-17 18:10:11 +0100 |
| commit | 43c64fa24d3d9922b080b5cb7bb5df249a759c1a (patch) | |
| tree | a885bd998cc8483fb0d9323b7e3bcd2fe25bba9b /include | |
| parent | 547617955af87640b46211b6715032bc6576279a (diff) | |
Revert "tdf#98458 sw: make search in shape text optional"
Actually there seems to be a simpler solution to the immediate performance
problem which I'll commit next.
It still might be necessary to introduce the search switch at some stage, but
first let's see if there are complaints.
This reverts commit 8e0b08c3053ed5472409b1ea7e02653aad38f7d6.
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, 1 insertions, 6 deletions
diff --git a/include/sfx2/msg.hxx b/include/sfx2/msg.hxx index 03972d5f27ca..6753181644a9 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(24); // for SvxSearchItem +SFX_DECL_TYPE(23); // 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 fb467b3f22d1..b5a2262958e5 100644 --- a/include/svl/memberid.hrc +++ b/include/svl/memberid.hrc @@ -61,7 +61,6 @@ #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 d67fff89819e..472f1ac3dd61 100644 --- a/include/svl/srchitem.hxx +++ b/include/svl/srchitem.hxx @@ -90,9 +90,6 @@ 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: @@ -201,7 +198,6 @@ public: sal_Int32 GetStartPointY() const; /// Either x or y start point is set. bool HasStartPoint() const; - bool IsSearchInShapes() const; }; const OUString& SvxSearchItem::GetSearchString() const |