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

[Stephan Bergmann (via logerrit)]

 connectivity/source/manager/mdrivermanager.cxx |   23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

New commits:
commit effc64f238bf0832229b7043dc8497a9cce5548a
Author:     Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Mar 15 12:15:26 2023 +0100
Commit:     Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Mar 15 14:54:26 2023 +0000

    Simplify AcceptsURL
    
    Change-Id: I14cd7d6bce2d5d5160e21b4fd12dcb77572925b1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148922
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sberg...@redhat.com>

diff --git a/connectivity/source/manager/mdrivermanager.cxx 
b/connectivity/source/manager/mdrivermanager.cxx
index 15bea9f74eaa..dbc35c2c4072 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -158,22 +158,11 @@ namespace
     };
 
     // predicate for checking whether or not a driver accepts a given URL
-    class AcceptsURL
+    bool AcceptsURL( const OUString& _rURL, const Reference<XDriver>& _rDriver 
)
     {
-    protected:
-        const OUString& m_rURL;
-
-    public:
-        // ctor
-        explicit AcceptsURL( const OUString& _rURL ) : m_rURL( _rURL ) { }
-
-
-        bool operator()( const Reference<XDriver>& _rDriver ) const
-        {
-            // ask the driver
-            return _rDriver.is() && _rDriver->acceptsURL( m_rURL );
-        }
-    };
+        // ask the driver
+        return _rDriver.is() && _rDriver->acceptsURL( _rURL );
+    }
 
 #if !ENABLE_FUZZERS
     sal_Int32 lcl_getDriverPrecedence( const Reference<XComponentContext>& 
_rContext, Sequence< OUString >& _rPrecedence )
@@ -620,7 +609,7 @@ Reference< XDriver > 
OSDBCDriverManager::implGetDriverForURL(const OUString& _rU
                     // extract the driver from the access, then ask the 
resulting driver for acceptance
                     const DriverAccess& ensuredAccess = 
EnsureDriver(m_xContext)(driverAccess);
                     const Reference<XDriver> driver = 
ExtractDriverFromAccess()(ensuredAccess);
-                    return AcceptsURL(_rURL)(driver);
+                    return AcceptsURL(_rURL, driver);
                 });
         } // if ( m_aDriversBS.find(sDriverFactoryName ) == m_aDriversBS.end() 
)
         else
@@ -643,7 +632,7 @@ Reference< XDriver > 
OSDBCDriverManager::implGetDriverForURL(const OUString& _rU
             [&_rURL] (const DriverCollection::value_type& element) {
                 // extract the driver from the collection element, then ask 
the resulting driver for acceptance
                 const Reference<XDriver> driver = 
ExtractDriverFromCollectionElement()(element);
-                return AcceptsURL(_rURL)(driver);
+                return AcceptsURL(_rURL, driver);
             });
 
         if ( m_aDriversRT.end() != aPos )