From 6d1b241ab7b2edf3f3eef26f4cc514c22849caf5 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 11 Oct 2023 13:27:51 +0200 Subject: 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 --- editeng/source/uno/unoipset.cxx | 2 +- editeng/source/uno/unotext.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'editeng/source/uno') diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx index 5ac72ee1ca6a..4a4dd9f5e505 100644 --- a/editeng/source/uno/unoipset.cxx +++ b/editeng/source/uno/unoipset.cxx @@ -31,7 +31,7 @@ using namespace ::com::sun::star; -SvxItemPropertySet::SvxItemPropertySet( o3tl::span pMap, SfxItemPool& rItemPool ) +SvxItemPropertySet::SvxItemPropertySet( std::span pMap, SfxItemPool& rItemPool ) : m_aPropertyMap( pMap ), mrItemPool( rItemPool ) { diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index be92bb4d89d3..99635d7d490a 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -79,7 +79,7 @@ const SvxItemPropertySet* ImplGetSvxUnoOutlinerTextCursorSvxPropertySet() return &aTextCursorSvxPropertySet; } -o3tl::span ImplGetSvxTextPortionPropertyMap() +std::span ImplGetSvxTextPortionPropertyMap() { // Propertymap for an Outliner Text static const SfxItemPropertyMapEntry aSvxTextPortionPropertyMap[] = @@ -107,7 +107,7 @@ static const SfxItemPropertySet* ImplGetSvxTextPortionSfxPropertySet() return &aSvxTextPortionSfxPropertySet; } -o3tl::span ImplGetSvxUnoOutlinerTextCursorPropertyMap() +std::span ImplGetSvxUnoOutlinerTextCursorPropertyMap() { // Propertymap for an Outliner Text static const SfxItemPropertyMapEntry aSvxUnoOutlinerTextCursorPropertyMap[] = -- cgit