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 /svl | |
| 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 'svl')
| -rw-r--r-- | svl/source/items/srchitem.cxx | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx index 881c464ee1f4..752a88881487 100644 --- a/svl/source/items/srchitem.cxx +++ b/svl/source/items/srchitem.cxx @@ -127,7 +127,8 @@ SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) : m_bContent ( false ), m_bAsianOptions ( false ), m_nStartPointX(0), - m_nStartPointY(0) + m_nStartPointY(0), + m_bSearchInShapes(false) { EnableNotification( lcl_GetNotifyNames() ); @@ -226,7 +227,8 @@ SvxSearchItem::SvxSearchItem( const SvxSearchItem& rItem ) : m_bContent ( rItem.m_bContent ), m_bAsianOptions ( rItem.m_bAsianOptions ), m_nStartPointX(rItem.m_nStartPointX), - m_nStartPointY(rItem.m_nStartPointY) + m_nStartPointY(rItem.m_nStartPointY), + m_bSearchInShapes(rItem.m_bSearchInShapes) { EnableNotification( lcl_GetNotifyNames() ); } @@ -670,6 +672,11 @@ bool SvxSearchItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) bRet = (rVal >>= m_nStartPointY); break; } + case MID_SEARCH_INSHAPES: + { + bRet = (rVal >>= m_bSearchInShapes); + break; + } default: OSL_FAIL( "Unknown MemberId" ); } @@ -692,4 +699,9 @@ bool SvxSearchItem::HasStartPoint() const return m_nStartPointX > 0 || m_nStartPointY > 0; } +bool SvxSearchItem::IsSearchInShapes() const +{ + return m_bSearchInShapes; +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |