diff options
Diffstat (limited to 'sc')
23 files changed, 37 insertions, 37 deletions
diff --git a/sc/inc/optuno.hxx b/sc/inc/optuno.hxx index 433dc7ec1898..72050044e363 100644 --- a/sc/inc/optuno.hxx +++ b/sc/inc/optuno.hxx @@ -39,7 +39,7 @@ class ScDocOptionsHelper { public: - static o3tl::span<const SfxItemPropertyMapEntry> GetPropertyMap(); + static std::span<const SfxItemPropertyMapEntry> GetPropertyMap(); static bool setPropertyValue( ScDocOptions& rOptions, const SfxItemPropertyMap& rPropMap, diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index f2f14653ab09..df9c3c3322aa 100644 --- a/sc/inc/pch/precompiled_sc.hxx +++ b/sc/inc/pch/precompiled_sc.hxx @@ -47,6 +47,7 @@ #include <optional> #include <ostream> #include <set> +#include <span> #include <sstream> #include <stddef.h> #include <stdexcept> @@ -344,7 +345,6 @@ #include <o3tl/enumarray.hxx> #include <o3tl/safeint.hxx> #include <o3tl/sorted_vector.hxx> -#include <o3tl/span.hxx> #include <o3tl/string_view.hxx> #include <o3tl/strong_int.hxx> #include <o3tl/typed_flags_set.hxx> diff --git a/sc/source/ui/unoobj/PivotTableDataProvider.cxx b/sc/source/ui/unoobj/PivotTableDataProvider.cxx index 97b9a09d6d36..e3c800128b0b 100644 --- a/sc/source/ui/unoobj/PivotTableDataProvider.cxx +++ b/sc/source/ui/unoobj/PivotTableDataProvider.cxx @@ -61,7 +61,7 @@ constexpr OUStringLiteral constIdCategories(u"categories"); constexpr OUStringLiteral constIdLabel(u"label"); constexpr OUStringLiteral constIdData(u"data"); -o3tl::span<const SfxItemPropertyMapEntry> lcl_GetDataProviderPropertyMap() +std::span<const SfxItemPropertyMapEntry> lcl_GetDataProviderPropertyMap() { static const SfxItemPropertyMapEntry aDataProviderPropertyMap_Impl[] = { diff --git a/sc/source/ui/unoobj/PivotTableDataSequence.cxx b/sc/source/ui/unoobj/PivotTableDataSequence.cxx index d1a3c278c6fc..dc81d03978e0 100644 --- a/sc/source/ui/unoobj/PivotTableDataSequence.cxx +++ b/sc/source/ui/unoobj/PivotTableDataSequence.cxx @@ -28,7 +28,7 @@ namespace sc SC_SIMPLE_SERVICE_INFO( PivotTableDataSequence, "PivotTableDataSequence", "com.sun.star.chart2.data.DataSequence") -static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetDataSequencePropertyMap() +static std::span<const SfxItemPropertyMapEntry> lcl_GetDataSequencePropertyMap() { static const SfxItemPropertyMapEntry aDataSequencePropertyMap_Impl[] = { diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index cc4fd1fe53ce..7fbf1ba74639 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -48,7 +48,7 @@ using namespace ::com::sun::star; // AutoFormat map only for PropertySetInfo without Which-IDs -static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetAutoFormatMap() +static std::span<const SfxItemPropertyMapEntry> lcl_GetAutoFormatMap() { static const SfxItemPropertyMapEntry aAutoFormatMap_Impl[] = { @@ -65,7 +65,7 @@ static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetAutoFormatMap() //! number format (String/Language) ??? (in XNumberFormat only ReadOnly) //! table::TableBorder ??!? -static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetAutoFieldMap() +static std::span<const SfxItemPropertyMapEntry> lcl_GetAutoFieldMap() { static const SfxItemPropertyMapEntry aAutoFieldMap_Impl[] = { diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index 9cfa82e4afc7..5365b3474611 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -52,7 +52,7 @@ using namespace com::sun::star; // everything without Which-ID, map only for PropertySetInfo -static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetSettingsPropertyMap() +static std::span<const SfxItemPropertyMapEntry> lcl_GetSettingsPropertyMap() { static const SfxItemPropertyMapEntry aSettingsPropertyMap_Impl[] = { diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 956e13436de6..7dde419b369d 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -790,7 +790,7 @@ static const SfxItemPropertySet* lcl_GetSheetPropertySet() return &aSheetPropertySet; } -static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetEditPropertyMap() +static std::span<const SfxItemPropertyMapEntry> lcl_GetEditPropertyMap() { static const SfxItemPropertyMapEntry aEditPropertyMap_Impl[] = { diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 7fb711b53ac6..e20a473f06ef 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -80,7 +80,7 @@ using ::std::shared_ptr; namespace { -o3tl::span<const SfxItemPropertyMapEntry> lcl_GetDataProviderPropertyMap() +std::span<const SfxItemPropertyMapEntry> lcl_GetDataProviderPropertyMap() { static const SfxItemPropertyMapEntry aDataProviderPropertyMap_Impl[] = { @@ -90,7 +90,7 @@ o3tl::span<const SfxItemPropertyMapEntry> lcl_GetDataProviderPropertyMap() return aDataProviderPropertyMap_Impl; } -o3tl::span<const SfxItemPropertyMapEntry> lcl_GetDataSequencePropertyMap() +std::span<const SfxItemPropertyMapEntry> lcl_GetDataSequencePropertyMap() { static const SfxItemPropertyMapEntry aDataSequencePropertyMap_Impl[] = { diff --git a/sc/source/ui/unoobj/condformatuno.cxx b/sc/source/ui/unoobj/condformatuno.cxx index ff94ba224d60..945752a3c561 100644 --- a/sc/source/ui/unoobj/condformatuno.cxx +++ b/sc/source/ui/unoobj/condformatuno.cxx @@ -46,7 +46,7 @@ enum CondFormatProperties CondFormat_Range }; -o3tl::span<const SfxItemPropertyMapEntry> getCondFormatPropset() +std::span<const SfxItemPropertyMapEntry> getCondFormatPropset() { static const SfxItemPropertyMapEntry aCondFormatPropertyMap_Impl[] = { @@ -64,7 +64,7 @@ enum ConditionEntryProperties Operator }; -o3tl::span<const SfxItemPropertyMapEntry> getConditionEntryrPropSet() +std::span<const SfxItemPropertyMapEntry> getConditionEntryrPropSet() { static const SfxItemPropertyMapEntry aConditionEntryPropertyMap_Impl[] = { @@ -117,7 +117,7 @@ enum ColorScaleProperties ColorScaleEntries }; -o3tl::span<const SfxItemPropertyMapEntry> getColorScalePropSet() +std::span<const SfxItemPropertyMapEntry> getColorScalePropSet() { static const SfxItemPropertyMapEntry aColorScalePropertyMap_Impl[] = { @@ -156,7 +156,7 @@ enum DataBarProperties MaximumLength }; -o3tl::span<const SfxItemPropertyMapEntry> getDataBarPropSet() +std::span<const SfxItemPropertyMapEntry> getDataBarPropSet() { static const SfxItemPropertyMapEntry aDataBarPropertyMap_Impl[] = { @@ -212,7 +212,7 @@ enum IconSetProperties IconSetEntries }; -o3tl::span<const SfxItemPropertyMapEntry> getIconSetPropSet() +std::span<const SfxItemPropertyMapEntry> getIconSetPropSet() { static const SfxItemPropertyMapEntry aIconSetPropertyMap_Impl[] = { @@ -274,7 +274,7 @@ enum DateProperties DateType }; -o3tl::span<const SfxItemPropertyMapEntry> getCondDatePropSet() +std::span<const SfxItemPropertyMapEntry> getCondDatePropSet() { static const SfxItemPropertyMapEntry aCondDatePropertyMap_Impl[] = { diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx index 87236a3fcc4d..575b7fc8ff08 100644 --- a/sc/source/ui/unoobj/confuno.cxx +++ b/sc/source/ui/unoobj/confuno.cxx @@ -47,7 +47,7 @@ using namespace com::sun::star; constexpr OUStringLiteral SCSAVEVERSION = u"SaveVersionOnClose"; -static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetConfigPropertyMap() +static std::span<const SfxItemPropertyMapEntry> lcl_GetConfigPropertyMap() { static const SfxItemPropertyMapEntry aConfigPropertyMap_Impl[] = { diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index bc46bcf93786..5b06bf4c1840 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -102,7 +102,7 @@ using ::com::sun::star::table::CellRangeAddress; namespace { -o3tl::span<const SfxItemPropertyMapEntry> lcl_GetDataPilotDescriptorBaseMap() +std::span<const SfxItemPropertyMapEntry> lcl_GetDataPilotDescriptorBaseMap() { static const SfxItemPropertyMapEntry aDataPilotDescriptorBaseMap_Impl[] = { @@ -120,7 +120,7 @@ o3tl::span<const SfxItemPropertyMapEntry> lcl_GetDataPilotDescriptorBaseMap() return aDataPilotDescriptorBaseMap_Impl; } -o3tl::span<const SfxItemPropertyMapEntry> lcl_GetDataPilotFieldMap() +std::span<const SfxItemPropertyMapEntry> lcl_GetDataPilotFieldMap() { using namespace ::com::sun::star::beans::PropertyAttribute; static const SfxItemPropertyMapEntry aDataPilotFieldMap_Impl[] = @@ -148,7 +148,7 @@ o3tl::span<const SfxItemPropertyMapEntry> lcl_GetDataPilotFieldMap() return aDataPilotFieldMap_Impl; } -o3tl::span<const SfxItemPropertyMapEntry> lcl_GetDataPilotItemMap() +std::span<const SfxItemPropertyMapEntry> lcl_GetDataPilotItemMap() { static const SfxItemPropertyMapEntry aDataPilotItemMap_Impl[] = { diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index 71b28feb35dd..1bbd661a4f8b 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -70,7 +70,7 @@ using namespace css::sheet; // everything without Which-ID, map only for PropertySetInfo -static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetSubTotalPropertyMap() +static std::span<const SfxItemPropertyMapEntry> lcl_GetSubTotalPropertyMap() { // some old property names are for 5.2 compatibility @@ -92,7 +92,7 @@ static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetSubTotalPropertyMap() return aSubTotalPropertyMap_Impl; } -static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetFilterPropertyMap() +static std::span<const SfxItemPropertyMapEntry> lcl_GetFilterPropertyMap() { static const SfxItemPropertyMapEntry aFilterPropertyMap_Impl[] = { @@ -109,7 +109,7 @@ static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetFilterPropertyMap() return aFilterPropertyMap_Impl; } -static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetDBRangePropertyMap() +static std::span<const SfxItemPropertyMapEntry> lcl_GetDBRangePropertyMap() { static const SfxItemPropertyMapEntry aDBRangePropertyMap_Impl[] = { diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx index af267fb4aecb..516fc8c6c768 100644 --- a/sc/source/ui/unoobj/defltuno.cxx +++ b/sc/source/ui/unoobj/defltuno.cxx @@ -36,7 +36,7 @@ class SvxFontItem; using namespace ::com::sun::star; -static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetDocDefaultsMap() +static std::span<const SfxItemPropertyMapEntry> lcl_GetDocDefaultsMap() { static const SfxItemPropertyMapEntry aDocDefaultsMap_Impl[] = { diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index d720630a8a38..9ef2e5971528 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -142,7 +142,7 @@ constexpr OUStringLiteral SC_UNO_VBAGLOBNAME = u"VBAGlobalConstantName"; // no Which-ID here, map only for PropertySetInfo //! rename this, those are no longer only options -static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetDocOptPropertyMap() +static std::span<const SfxItemPropertyMapEntry> lcl_GetDocOptPropertyMap() { static const SfxItemPropertyMapEntry aDocOptPropertyMap_Impl[] = { @@ -197,7 +197,7 @@ static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetDocOptPropertyMap() //! StandardDecimals as property and from NumberFormatter ???????? -static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetColumnsPropertyMap() +static std::span<const SfxItemPropertyMapEntry> lcl_GetColumnsPropertyMap() { static const SfxItemPropertyMapEntry aColumnsPropertyMap_Impl[] = { @@ -210,7 +210,7 @@ static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetColumnsPropertyMap() return aColumnsPropertyMap_Impl; } -static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetRowsPropertyMap() +static std::span<const SfxItemPropertyMapEntry> lcl_GetRowsPropertyMap() { static const SfxItemPropertyMapEntry aRowsPropertyMap_Impl[] = { diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index d380b95f2314..1b9185591739 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -44,7 +44,7 @@ using namespace ::formula; // map only for PropertySetInfo -static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetValidatePropertyMap() +static std::span<const SfxItemPropertyMapEntry> lcl_GetValidatePropertyMap() { static const SfxItemPropertyMapEntry aValidatePropertyMap_Impl[] = { diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index 8ee0910c3d13..b8c6a9c7e35e 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -53,7 +53,7 @@ using ::com::sun::star::uno::RuntimeException; using ::std::vector; // used for sheet- and area link: -static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetSheetLinkMap() +static std::span<const SfxItemPropertyMapEntry> lcl_GetSheetLinkMap() { static const SfxItemPropertyMapEntry aSheetLinkMap_Impl[] = { diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index 6e02ab723b62..39973ba74cad 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -48,7 +48,7 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; -static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetNamedRangeMap() +static std::span<const SfxItemPropertyMapEntry> lcl_GetNamedRangeMap() { static const SfxItemPropertyMapEntry aNamedRangeMap_Impl[] = { @@ -60,7 +60,7 @@ static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetNamedRangeMap() return aNamedRangeMap_Impl; } -static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetNamedRangesMap() +static std::span<const SfxItemPropertyMapEntry> lcl_GetNamedRangesMap() { static const SfxItemPropertyMapEntry aNamedRangesMap_Impl[] = { diff --git a/sc/source/ui/unoobj/optuno.cxx b/sc/source/ui/unoobj/optuno.cxx index c9ccc8878065..09e17add09b8 100644 --- a/sc/source/ui/unoobj/optuno.cxx +++ b/sc/source/ui/unoobj/optuno.cxx @@ -29,7 +29,7 @@ using namespace com::sun::star; -o3tl::span<const SfxItemPropertyMapEntry> ScDocOptionsHelper::GetPropertyMap() +std::span<const SfxItemPropertyMapEntry> ScDocOptionsHelper::GetPropertyMap() { static const SfxItemPropertyMapEntry aMap[] = { diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index 49eb4220fa6c..f14be95c65c9 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -49,7 +49,7 @@ using namespace ::com::sun::star; -static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetShapeMap() +static std::span<const SfxItemPropertyMapEntry> lcl_GetShapeMap() { static const SfxItemPropertyMapEntry aShapeMap_Impl[] = { diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx index 036f6c89817b..e06fe501df6e 100644 --- a/sc/source/ui/unoobj/srchuno.cxx +++ b/sc/source/ui/unoobj/srchuno.cxx @@ -32,7 +32,7 @@ using namespace com::sun::star; // SfxItemPropertyMapEntry only for GetPropertySetInfo -static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetSearchPropertyMap() +static std::span<const SfxItemPropertyMapEntry> lcl_GetSearchPropertyMap() { static const SfxItemPropertyMapEntry aSearchPropertyMap_Impl[] = { diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx index 54f517e50bc7..f3b4888ae535 100644 --- a/sc/source/ui/unoobj/targuno.cxx +++ b/sc/source/ui/unoobj/targuno.cxx @@ -49,7 +49,7 @@ const TranslateId aTypeResIds[SC_LINKTARGETTYPE_COUNT] = SCSTR_CONTENT_DBAREA // SC_LINKTARGETTYPE_DBAREA }; -static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetLinkTargetMap() +static std::span<const SfxItemPropertyMapEntry> lcl_GetLinkTargetMap() { static const SfxItemPropertyMapEntry aLinkTargetMap_Impl[] = { diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx index 32570f3914db..90b0a87e30f9 100644 --- a/sc/source/ui/unoobj/tokenuno.cxx +++ b/sc/source/ui/unoobj/tokenuno.cxx @@ -46,7 +46,7 @@ using namespace ::formula; using namespace ::com::sun::star; -static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetFormulaParserMap() +static std::span<const SfxItemPropertyMapEntry> lcl_GetFormulaParserMap() { static const SfxItemPropertyMapEntry aFormulaParserMap_Impl[] = { diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index e4bd505a5e09..e139b4a59ec6 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -80,7 +80,7 @@ using namespace com::sun::star; // no Which-ID here, Map only for PropertySetInfo -static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetViewOptPropertyMap() +static std::span<const SfxItemPropertyMapEntry> lcl_GetViewOptPropertyMap() { static const SfxItemPropertyMapEntry aViewOptPropertyMap_Impl[] = { |