Drop o3tl::span, can use C++20 std::span directly now

Change-Id: Ic21ff7bf48f07f7277979d52e99d2c5c268de83f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157825
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

5 files changed, 10 insertions, 10 deletions

diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx
index 86b6677ffa1d..fe05d7f5ba2b 100644
--- a/filter/source/config/cache/basecontainer.cxx
+++ b/filter/source/config/cache/basecontainer.cxx
@@ -347,7 +347,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL BaseContainer::crea
         // search the key names of all items, where its properties match
         // the given ones in its minimum
         FilterCache* pCache = impl_getWorkingCache(aLock);
-        lKeys = pCache->getMatchingItemsByProps(m_eType, o3tl::span<const css::beans::NamedValue>( lProperties.getConstArray(), lProperties.getLength() ));
+        lKeys = pCache->getMatchingItemsByProps(m_eType, std::span<const css::beans::NamedValue>( lProperties.getConstArray(), lProperties.getLength() ));
     }
     catch(const css::uno::Exception&)
     {
diff --git a/filter/source/config/cache/cacheitem.cxx b/filter/source/config/cache/cacheitem.cxx
index 595d3891aa7d..dddb7d464286 100644
--- a/filter/source/config/cache/cacheitem.cxx
+++ b/filter/source/config/cache/cacheitem.cxx
@@ -263,7 +263,7 @@ static bool isSubSet(const css::uno::Any& aSubSet,
 }
 
 
-bool CacheItem::haveProps(o3tl::span< const css::beans::NamedValue > lProps) const
+bool CacheItem::haveProps(std::span< const css::beans::NamedValue > lProps) const
 {
     for (auto const& prop : lProps)
     {
@@ -288,7 +288,7 @@ bool CacheItem::haveProps(o3tl::span< const css::beans::NamedValue > lProps) con
 }
 
 
-bool CacheItem::dontHaveProps(o3tl::span< const css::beans::NamedValue > lProps) const
+bool CacheItem::dontHaveProps(std::span< const css::beans::NamedValue > lProps) const
 {
     for (auto const& prop : lProps)
     {
diff --git a/filter/source/config/cache/cacheitem.hxx b/filter/source/config/cache/cacheitem.hxx
index b20bf72c805c..9ed263442150 100644
--- a/filter/source/config/cache/cacheitem.hxx
+++ b/filter/source/config/cache/cacheitem.hxx
@@ -19,12 +19,12 @@
 
 #pragma once
 
+#include <span>
 #include <unordered_map>
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <vector>
 #include <comphelper/sequenceashashmap.hxx>
-#include <o3tl/span.hxx>
 
 namespace filter::config {
 
@@ -74,7 +74,7 @@ class CacheItem : public ::comphelper::SequenceAsHashMap
             @return sal_True if all given properties exists
                     at this item; sal_False otherwise.
          */
-        bool haveProps(o3tl::span< const css::beans::NamedValue > lProps) const;
+        bool haveProps(std::span< const css::beans::NamedValue > lProps) const;
 
 
         /** @short  check, if the given properties don't exist
@@ -90,7 +90,7 @@ class CacheItem : public ::comphelper::SequenceAsHashMap
             @return sal_False if at least on property exists at this item(!);
                     sal_True otherwise.
          */
-        bool dontHaveProps(o3tl::span< const css::beans::NamedValue > lProps) const;
+        bool dontHaveProps(std::span< const css::beans::NamedValue > lProps) const;
 
 
         /** @short  because we know two UIName properties
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index 534195893744..714d051458c1 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -245,8 +245,8 @@ bool FilterCache::isFillState(FilterCache::EFillState eState) const
 
 
 std::vector<OUString> FilterCache::getMatchingItemsByProps(      EItemType  eType  ,
-                                                  o3tl::span< const css::beans::NamedValue > lIProps,
-                                                  o3tl::span< const css::beans::NamedValue > lEProps) const
+                                                  std::span< const css::beans::NamedValue > lIProps,
+                                                  std::span< const css::beans::NamedValue > lEProps) const
 {
     // SAFE ->
     std::unique_lock aGuard(m_aMutex);
diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx
index a48e3df62767..abfa712895d1 100644
--- a/filter/source/config/cache/filtercache.hxx
+++ b/filter/source/config/cache/filtercache.hxx
@@ -365,8 +365,8 @@ class FilterCache
                         any longer, because any operation before damage it.
          */
         std::vector<OUString> getMatchingItemsByProps( EItemType  eType,
-                                                     o3tl::span< const css::beans::NamedValue > lIProps,
-                                                     o3tl::span< const css::beans::NamedValue > lEProps = {}) const;
+                                                     std::span< const css::beans::NamedValue > lIProps,
+                                                     std::span< const css::beans::NamedValue > lEProps = {}) const;
 
 
         /** @short      indicates if the requested sub container