[Libreoffice-commits] core.git: include/svl

Stephan Bergmann sbergman at redhat.com
Fri Feb 26 08:16:25 UTC 2016


 include/svl/srchitem.hxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9634b3709798bbb690e3e4b6386329ac76c211b7
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Feb 26 09:15:53 2016 +0100

    loplugin:simplifybool
    
    Change-Id: Ie213b385d666aa17d47e6c85ff1fbdbc31bac0b9

diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx
index 6c997d5..18547bc 100644
--- a/include/svl/srchitem.hxx
+++ b/include/svl/srchitem.hxx
@@ -249,9 +249,9 @@ bool SvxSearchItem::GetWildcard() const
 {
     // Ensure old and new algorithm types are in sync, in this case old is not
     // REGEXP or APPROXIMATE.
-    assert( (m_aSearchOpt.AlgorithmType2 == css::util::SearchAlgorithms2::WILDCARD) ?
+    assert( m_aSearchOpt.AlgorithmType2 != css::util::SearchAlgorithms2::WILDCARD ||
             (m_aSearchOpt.algorithmType != css::util::SearchAlgorithms_REGEXP &&
-             m_aSearchOpt.algorithmType != css::util::SearchAlgorithms_APPROXIMATE) : true );
+             m_aSearchOpt.algorithmType != css::util::SearchAlgorithms_APPROXIMATE) );
     return m_aSearchOpt.AlgorithmType2 == css::util::SearchAlgorithms2::WILDCARD ;
 }
 


More information about the Libreoffice-commits mailing list