[Libreoffice-commits] core.git: fpicker/source

[Takeshi Abe]

 fpicker/source/aqua/FilterHelper.mm        |   23 +++++++++--------------
 fpicker/source/office/OfficeFilePicker.cxx |    6 +++---
 2 files changed, 12 insertions(+), 17 deletions(-)

New commits:
commit d75cdda84fb98ec616b57a3dc0606d21c2413e47
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Mon May 18 14:27:44 2015 +0900

    fpicker: simplify code by std::any_of
    
    Change-Id: I0f5a8b5d7f8f88a821793004c1574fcb6a7a4882
    Reviewed-on: https://gerrit.libreoffice.org/15836
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/fpicker/source/aqua/FilterHelper.mm b/fpicker/source/aqua/FilterHelper.mm
index e37378d..fecea53f 100644
--- a/fpicker/source/aqua/FilterHelper.mm
+++ b/fpicker/source/aqua/FilterHelper.mm
@@ -162,11 +162,9 @@ public:
             else
                 // a filter group -> search the sub filters
                 bMatch =
-                    _rEntry.endSubFilters() != ::std::find_if(
-                                                              _rEntry.beginSubFilters(),
-                                                              _rEntry.endSubFilters(),
-                                                              *this
-                                                              );
+                    ::std::any_of(_rEntry.beginSubFilters(),
+                                  _rEntry.endSubFilters(),
+                                  *this);
 
             return bMatch;
         }
@@ -221,11 +219,9 @@ bool FilterHelper::FilterNameExists( const rtl::OUString& rTitle )
 
     if( m_pFilterList )
         bRet =
-            m_pFilterList->end() != ::std::find_if(
-                                                   m_pFilterList->begin(),
-                                                   m_pFilterList->end(),
-                                                   FilterTitleMatch( rTitle )
-                                                   );
+            ::std::any_of(m_pFilterList->begin(),
+                          m_pFilterList->end(),
+                          FilterTitleMatch( rTitle ));
 
     return bRet;
 }
@@ -240,10 +236,9 @@ bool FilterHelper::FilterNameExists( const UnoFilterList& _rGroupedFilters )
         const UnoFilterEntry* pStart = _rGroupedFilters.getConstArray();
         const UnoFilterEntry* pEnd = pStart + _rGroupedFilters.getLength();
         for( ; pStart != pEnd; ++pStart )
-            if( m_pFilterList->end() != ::std::find_if(
-                                                        m_pFilterList->begin(),
-                                                        m_pFilterList->end(),
-                                                        FilterTitleMatch( pStart->First ) ) )
+            if( ::std::any_of(m_pFilterList->begin(),
+                              m_pFilterList->end(),
+                              FilterTitleMatch( pStart->First ) ) )
                 break;
 
         bRet = (pStart != pEnd);
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index 6fd28ed..20d6e1d 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -358,7 +358,7 @@ namespace {
             else
                 // a filter group -> search the sub filters
                 bMatch =
-                    _rEntry.endSubFilters() != ::std::find_if(
+                    ::std::any_of(
                         _rEntry.beginSubFilters(),
                         _rEntry.endSubFilters(),
                         *this
@@ -380,7 +380,7 @@ bool SvtFilePicker::FilterNameExists( const OUString& rTitle )
 
     if ( m_pFilterList )
         bRet =
-            m_pFilterList->end() != ::std::find_if(
+            ::std::any_of(
                 m_pFilterList->begin(),
                 m_pFilterList->end(),
                 FilterTitleMatch( rTitle )
@@ -399,7 +399,7 @@ bool SvtFilePicker::FilterNameExists( const UnoFilterList& _rGroupedFilters )
         const UnoFilterEntry* pStart = _rGroupedFilters.getConstArray();
         const UnoFilterEntry* pEnd = pStart + _rGroupedFilters.getLength();
         for ( ; pStart != pEnd; ++pStart )
-            if ( m_pFilterList->end() != ::std::find_if( m_pFilterList->begin(), m_pFilterList->end(), FilterTitleMatch( pStart->First ) ) )
+            if ( ::std::any_of( m_pFilterList->begin(), m_pFilterList->end(), FilterTitleMatch( pStart->First ) ) )
                 break;
 
         bRet = pStart != pEnd;