diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-10-11 13:27:51 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-10-11 21:53:13 +0200 |
| commit | 6d1b241ab7b2edf3f3eef26f4cc514c22849caf5 (patch) | |
| tree | 3c8c3b278b5fe084434b0bee682575d4a41c0adb /svl | |
| parent | 432e34fd1e0309038d0765f2497b7925c16a8ed2 (diff) | |
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>
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/items/itemprop.cxx | 6 | ||||
| -rw-r--r-- | svl/source/numbers/numfmuno.cxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx index e8dd3ccd28ef..3885542f89b8 100644 --- a/svl/source/items/itemprop.cxx +++ b/svl/source/items/itemprop.cxx @@ -35,7 +35,7 @@ using namespace com::sun::star::beans; using namespace com::sun::star::lang; using namespace com::sun::star::uno; -SfxItemPropertyMap::SfxItemPropertyMap( o3tl::span<const SfxItemPropertyMapEntry> pEntries ) +SfxItemPropertyMap::SfxItemPropertyMap( std::span<const SfxItemPropertyMapEntry> pEntries ) { m_aMap.reserve(pEntries.size()); for (const auto & pEntry : pEntries) @@ -246,7 +246,7 @@ SfxItemPropertySetInfo::SfxItemPropertySetInfo(const SfxItemPropertyMap &rMap ) { } -SfxItemPropertySetInfo::SfxItemPropertySetInfo(o3tl::span<const SfxItemPropertyMapEntry> pEntries ) +SfxItemPropertySetInfo::SfxItemPropertySetInfo(std::span<const SfxItemPropertyMapEntry> pEntries ) : m_aOwnMap( pEntries ) { } @@ -270,7 +270,7 @@ sal_Bool SAL_CALL SfxItemPropertySetInfo::hasPropertyByName( const OUString& rNa return m_aOwnMap.hasPropertyByName( rName ); } -SfxExtItemPropertySetInfo::SfxExtItemPropertySetInfo( o3tl::span<const SfxItemPropertyMapEntry> pEntries, +SfxExtItemPropertySetInfo::SfxExtItemPropertySetInfo( std::span<const SfxItemPropertyMapEntry> pEntries, const Sequence<Property>& rPropSeq ) { maMap.reserve(pEntries.size() + rPropSeq.getLength()); diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx index c95ec9f4f0e5..41810574bffb 100644 --- a/svl/source/numbers/numfmuno.cxx +++ b/svl/source/numbers/numfmuno.cxx @@ -62,7 +62,7 @@ constexpr OUStringLiteral PROPERTYNAME_TWODIGIT = u"TwoDigitDateStart"; // All without a Which-ID, Map only for PropertySetInfo -static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetNumberFormatPropertyMap() +static std::span<const SfxItemPropertyMapEntry> lcl_GetNumberFormatPropertyMap() { static const SfxItemPropertyMapEntry aNumberFormatPropertyMap_Impl[] = { @@ -83,7 +83,7 @@ static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetNumberFormatPropertyMap( return aNumberFormatPropertyMap_Impl; } -static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetNumberSettingsPropertyMap() +static std::span<const SfxItemPropertyMapEntry> lcl_GetNumberSettingsPropertyMap() { static const SfxItemPropertyMapEntry aNumberSettingsPropertyMap_Impl[] = { |