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 /svl | |
| 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 'svl')
| -rw-r--r-- | svl/source/items/srchitem.cxx | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx index 752a88881487..881c464ee1f4 100644 --- a/svl/source/items/srchitem.cxx +++ b/svl/source/items/srchitem.cxx @@ -127,8 +127,7 @@ SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) : m_bContent ( false ), m_bAsianOptions ( false ), m_nStartPointX(0), - m_nStartPointY(0), - m_bSearchInShapes(false) + m_nStartPointY(0) { EnableNotification( lcl_GetNotifyNames() ); @@ -227,8 +226,7 @@ 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_bSearchInShapes(rItem.m_bSearchInShapes) + m_nStartPointY(rItem.m_nStartPointY) { EnableNotification( lcl_GetNotifyNames() ); } @@ -672,11 +670,6 @@ 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" ); } @@ -699,9 +692,4 @@ 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: */ |