diff options
Diffstat (limited to 'svx')
32 files changed, 62 insertions, 62 deletions
diff --git a/svx/inc/getallcharpropids.hxx b/svx/inc/getallcharpropids.hxx index e5c8d98f34d1..3a26f21976f9 100644 --- a/svx/inc/getallcharpropids.hxx +++ b/svx/inc/getallcharpropids.hxx @@ -22,14 +22,14 @@ #include <sal/config.h> #include <sal/types.h> -#include <o3tl/span.hxx> +#include <span> #include <vector> class SfxItemSet; class SfxPoolItem; std::vector<sal_uInt16> GetAllCharPropIds(const SfxItemSet& rSet); -std::vector<sal_uInt16> GetAllCharPropIds(o3tl::span<const SfxPoolItem* const> aChangedItems); +std::vector<sal_uInt16> GetAllCharPropIds(std::span<const SfxPoolItem* const> aChangedItems); #endif diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index 58e01e74e63f..a4e91325d20a 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -40,6 +40,7 @@ #include <optional> #include <ostream> #include <set> +#include <span> #include <stddef.h> #include <string> #include <string_view> @@ -265,7 +266,6 @@ #include <o3tl/deleter.hxx> #include <o3tl/safeint.hxx> #include <o3tl/sorted_vector.hxx> -#include <o3tl/span.hxx> #include <o3tl/string_view.hxx> #include <o3tl/typed_flags_set.hxx> #include <o3tl/underlyingenumvalue.hxx> diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx index afa38f9c8175..0a21fe48f2a0 100644 --- a/svx/inc/pch/precompiled_svxcore.hxx +++ b/svx/inc/pch/precompiled_svxcore.hxx @@ -47,6 +47,7 @@ #include <optional> #include <ostream> #include <set> +#include <span> #include <stack> #include <stddef.h> #include <string.h> @@ -360,7 +361,6 @@ #include <o3tl/deleter.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/svx/inc/sdr/properties/attributeproperties.hxx b/svx/inc/sdr/properties/attributeproperties.hxx index a150abe77385..fa193aeec28e 100644 --- a/svx/inc/sdr/properties/attributeproperties.hxx +++ b/svx/inc/sdr/properties/attributeproperties.hxx @@ -46,7 +46,7 @@ namespace sdr::properties virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = nullptr) override; // react on ItemSet changes - virtual void ItemSetChanged(o3tl::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) override; + virtual void ItemSetChanged(std::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) override; // apply the correct SfyStyleSheet from SdrObject's SdrModel virtual void applyDefaultStyleSheetFromSdrModel(); diff --git a/svx/inc/sdr/properties/captionproperties.hxx b/svx/inc/sdr/properties/captionproperties.hxx index 238ec4682612..625830c5e8db 100644 --- a/svx/inc/sdr/properties/captionproperties.hxx +++ b/svx/inc/sdr/properties/captionproperties.hxx @@ -31,7 +31,7 @@ namespace sdr::properties virtual SfxItemSet CreateObjectSpecificItemSet(SfxItemPool& rPool) override; // react on ItemSet changes - virtual void ItemSetChanged(o3tl::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) override; + virtual void ItemSetChanged(std::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) override; public: // basic constructor diff --git a/svx/inc/sdr/properties/cellproperties.hxx b/svx/inc/sdr/properties/cellproperties.hxx index 24106080a1d2..653c3b158a3a 100644 --- a/svx/inc/sdr/properties/cellproperties.hxx +++ b/svx/inc/sdr/properties/cellproperties.hxx @@ -65,7 +65,7 @@ public: void ForceDefaultAttributes() override; - void ItemSetChanged(o3tl::span<const SfxPoolItem* const> aChangedItems, + void ItemSetChanged(std::span<const SfxPoolItem* const> aChangedItems, sal_uInt16 nDeletedWhich) override; void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = nullptr) override; diff --git a/svx/inc/sdr/properties/circleproperties.hxx b/svx/inc/sdr/properties/circleproperties.hxx index 9eaa09dbc14d..3283aa65793d 100644 --- a/svx/inc/sdr/properties/circleproperties.hxx +++ b/svx/inc/sdr/properties/circleproperties.hxx @@ -31,7 +31,7 @@ namespace sdr::properties virtual SfxItemSet CreateObjectSpecificItemSet(SfxItemPool& rPool) override; // react on ItemSet changes - virtual void ItemSetChanged(o3tl::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) override; + virtual void ItemSetChanged(std::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) override; public: // basic constructor diff --git a/svx/inc/sdr/properties/connectorproperties.hxx b/svx/inc/sdr/properties/connectorproperties.hxx index b3f116289094..238b6f2364a2 100644 --- a/svx/inc/sdr/properties/connectorproperties.hxx +++ b/svx/inc/sdr/properties/connectorproperties.hxx @@ -31,7 +31,7 @@ namespace sdr::properties virtual SfxItemSet CreateObjectSpecificItemSet(SfxItemPool& rPool) override; // react on ItemSet changes - virtual void ItemSetChanged(o3tl::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) override; + virtual void ItemSetChanged(std::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) override; public: // basic constructor diff --git a/svx/inc/sdr/properties/customshapeproperties.hxx b/svx/inc/sdr/properties/customshapeproperties.hxx index 1cc83a2cf29f..964c956e3d20 100644 --- a/svx/inc/sdr/properties/customshapeproperties.hxx +++ b/svx/inc/sdr/properties/customshapeproperties.hxx @@ -37,7 +37,7 @@ namespace sdr::properties virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = nullptr) const override; // react on ItemSet changes - virtual void ItemSetChanged(o3tl::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) override; + virtual void ItemSetChanged(std::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) override; // react on Item change virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = nullptr) override; diff --git a/svx/inc/sdr/properties/e3dproperties.hxx b/svx/inc/sdr/properties/e3dproperties.hxx index caef0ff57ba7..519bf904a431 100644 --- a/svx/inc/sdr/properties/e3dproperties.hxx +++ b/svx/inc/sdr/properties/e3dproperties.hxx @@ -32,7 +32,7 @@ namespace sdr::properties virtual SfxItemSet CreateObjectSpecificItemSet(SfxItemPool& rPool) override; // react on ItemSet changes - virtual void ItemSetChanged(o3tl::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) override; + virtual void ItemSetChanged(std::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) override; public: // basic constructor diff --git a/svx/inc/sdr/properties/graphicproperties.hxx b/svx/inc/sdr/properties/graphicproperties.hxx index 7f842a9dcfd6..415d3681c5cd 100644 --- a/svx/inc/sdr/properties/graphicproperties.hxx +++ b/svx/inc/sdr/properties/graphicproperties.hxx @@ -34,7 +34,7 @@ namespace sdr::properties virtual SfxItemSet CreateObjectSpecificItemSet(SfxItemPool& rPool) override; // react on ItemSet changes - virtual void ItemSetChanged(o3tl::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) override; + virtual void ItemSetChanged(std::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) override; public: // basic constructor diff --git a/svx/inc/sdr/properties/measureproperties.hxx b/svx/inc/sdr/properties/measureproperties.hxx index 001f9778c98d..323cfaa6de92 100644 --- a/svx/inc/sdr/properties/measureproperties.hxx +++ b/svx/inc/sdr/properties/measureproperties.hxx @@ -31,7 +31,7 @@ namespace sdr::properties virtual SfxItemSet CreateObjectSpecificItemSet(SfxItemPool& rPool) override; // react on ItemSet changes - virtual void ItemSetChanged(o3tl::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) override; + virtual void ItemSetChanged(std::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) override; public: // basic constructor diff --git a/svx/inc/sdr/properties/rectangleproperties.hxx b/svx/inc/sdr/properties/rectangleproperties.hxx index 7694e9d3c44f..b0d6845f78f7 100644 --- a/svx/inc/sdr/properties/rectangleproperties.hxx +++ b/svx/inc/sdr/properties/rectangleproperties.hxx @@ -29,7 +29,7 @@ namespace sdr::properties { protected: // react on ItemSet changes - virtual void ItemSetChanged(o3tl::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) override; + virtual void ItemSetChanged(std::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) override; public: // basic constructor diff --git a/svx/inc/sdr/properties/textproperties.hxx b/svx/inc/sdr/properties/textproperties.hxx index 8a5065442ed0..bc46ef1b8bba 100644 --- a/svx/inc/sdr/properties/textproperties.hxx +++ b/svx/inc/sdr/properties/textproperties.hxx @@ -40,7 +40,7 @@ namespace sdr::properties virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = nullptr) override; // react on ItemSet changes - virtual void ItemSetChanged(o3tl::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) override; + virtual void ItemSetChanged(std::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) override; /// Get the TextProvider related to our SdrObject virtual const svx::ITextProvider& getTextProvider() const; diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx index d4a001795360..37bdc9cfa05a 100644 --- a/svx/source/sdr/properties/attributeproperties.cxx +++ b/svx/source/sdr/properties/attributeproperties.cxx @@ -275,7 +275,7 @@ namespace sdr::properties return *mxItemSet; } - void AttributeProperties::ItemSetChanged(o3tl::span< const SfxPoolItem* const > /*aChangedItems*/, sal_uInt16 /*nDeletedWhich*/) + void AttributeProperties::ItemSetChanged(std::span< const SfxPoolItem* const > /*aChangedItems*/, sal_uInt16 /*nDeletedWhich*/) { // own modifications SdrObject& rObj = GetSdrObject(); diff --git a/svx/source/sdr/properties/captionproperties.cxx b/svx/source/sdr/properties/captionproperties.cxx index 48106d18ef9d..93c6146ac0d4 100644 --- a/svx/source/sdr/properties/captionproperties.cxx +++ b/svx/source/sdr/properties/captionproperties.cxx @@ -62,7 +62,7 @@ namespace sdr::properties return std::unique_ptr<BaseProperties>(new CaptionProperties(*this, rObj)); } - void CaptionProperties::ItemSetChanged(o3tl::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) + void CaptionProperties::ItemSetChanged(std::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) { SdrCaptionObj& rObj = static_cast<SdrCaptionObj&>(GetSdrObject()); diff --git a/svx/source/sdr/properties/circleproperties.cxx b/svx/source/sdr/properties/circleproperties.cxx index 0c2a5bdc173a..6c77c365f989 100644 --- a/svx/source/sdr/properties/circleproperties.cxx +++ b/svx/source/sdr/properties/circleproperties.cxx @@ -66,7 +66,7 @@ namespace sdr::properties return std::unique_ptr<BaseProperties>(new CircleProperties(*this, rObj)); } - void CircleProperties::ItemSetChanged(o3tl::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) + void CircleProperties::ItemSetChanged(std::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) { SdrCircObj& rObj = static_cast<SdrCircObj&>(GetSdrObject()); diff --git a/svx/source/sdr/properties/connectorproperties.cxx b/svx/source/sdr/properties/connectorproperties.cxx index 375a98190d1e..8ae3f0ef3965 100644 --- a/svx/source/sdr/properties/connectorproperties.cxx +++ b/svx/source/sdr/properties/connectorproperties.cxx @@ -63,7 +63,7 @@ namespace sdr::properties return std::unique_ptr<BaseProperties>(new ConnectorProperties(*this, rObj)); } - void ConnectorProperties::ItemSetChanged(o3tl::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) + void ConnectorProperties::ItemSetChanged(std::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) { SdrEdgeObj& rObj = static_cast<SdrEdgeObj&>(GetSdrObject()); diff --git a/svx/source/sdr/properties/customshapeproperties.cxx b/svx/source/sdr/properties/customshapeproperties.cxx index cf79f77830c3..82ec37c7de07 100644 --- a/svx/source/sdr/properties/customshapeproperties.cxx +++ b/svx/source/sdr/properties/customshapeproperties.cxx @@ -124,7 +124,7 @@ namespace sdr::properties TextProperties::ClearObjectItemDirect( nWhich ); } - void CustomShapeProperties::ItemSetChanged(o3tl::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) + void CustomShapeProperties::ItemSetChanged(std::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) { // call parent TextProperties::ItemSetChanged(aChangedItems, nDeletedWhich); diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx index 2db2e018ed77..2d3d54c15e06 100644 --- a/svx/source/sdr/properties/defaultproperties.cxx +++ b/svx/source/sdr/properties/defaultproperties.cxx @@ -201,7 +201,7 @@ namespace sdr::properties } } - void DefaultProperties::ItemSetChanged(o3tl::span< const SfxPoolItem* const > /*aChangedItems*/, sal_uInt16 /*nDeletedWhich*/) + void DefaultProperties::ItemSetChanged(std::span< const SfxPoolItem* const > /*aChangedItems*/, sal_uInt16 /*nDeletedWhich*/) { } diff --git a/svx/source/sdr/properties/e3dproperties.cxx b/svx/source/sdr/properties/e3dproperties.cxx index 946f879de022..d7a106088e76 100644 --- a/svx/source/sdr/properties/e3dproperties.cxx +++ b/svx/source/sdr/properties/e3dproperties.cxx @@ -60,7 +60,7 @@ namespace sdr::properties return std::unique_ptr<BaseProperties>(new E3dProperties(*this, rObj)); } - void E3dProperties::ItemSetChanged(o3tl::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) + void E3dProperties::ItemSetChanged(std::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) { E3dObject& rObj = static_cast<E3dObject&>(GetSdrObject()); diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx index 85509f79c6a7..311b2708c490 100644 --- a/svx/source/sdr/properties/graphicproperties.cxx +++ b/svx/source/sdr/properties/graphicproperties.cxx @@ -94,7 +94,7 @@ namespace sdr::properties return std::unique_ptr<BaseProperties>(new GraphicProperties(*this, rObj)); } - void GraphicProperties::ItemSetChanged(o3tl::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) + void GraphicProperties::ItemSetChanged(std::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) { SdrGrafObj& rObj = static_cast<SdrGrafObj&>(GetSdrObject()); diff --git a/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx index 07441c385184..bd976345ba57 100644 --- a/svx/source/sdr/properties/measureproperties.cxx +++ b/svx/source/sdr/properties/measureproperties.cxx @@ -72,7 +72,7 @@ namespace sdr::properties return std::unique_ptr<BaseProperties>(new MeasureProperties(*this, rObj)); } - void MeasureProperties::ItemSetChanged(o3tl::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) + void MeasureProperties::ItemSetChanged(std::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) { SdrMeasureObj& rObj = static_cast<SdrMeasureObj&>(GetSdrObject()); diff --git a/svx/source/sdr/properties/rectangleproperties.cxx b/svx/source/sdr/properties/rectangleproperties.cxx index 4c3a72a2f496..71680e012b33 100644 --- a/svx/source/sdr/properties/rectangleproperties.cxx +++ b/svx/source/sdr/properties/rectangleproperties.cxx @@ -42,7 +42,7 @@ namespace sdr::properties return std::unique_ptr<BaseProperties>(new RectangleProperties(*this, rObj)); } - void RectangleProperties::ItemSetChanged(o3tl::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) + void RectangleProperties::ItemSetChanged(std::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) { SdrRectObj& rObj = static_cast<SdrRectObj&>(GetSdrObject()); diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx index 522225059d3a..101287b79b97 100644 --- a/svx/source/sdr/properties/textproperties.cxx +++ b/svx/source/sdr/properties/textproperties.cxx @@ -81,7 +81,7 @@ namespace sdr::properties return std::unique_ptr<BaseProperties>(new TextProperties(*this, rObj)); } - void TextProperties::ItemSetChanged(o3tl::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) + void TextProperties::ItemSetChanged(std::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) { SdrTextObj& rObj = static_cast<SdrTextObj&>(GetSdrObject()); diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index 430c655dfb1e..ee8945a82149 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -1048,7 +1048,7 @@ std::vector<sal_uInt16> GetAllCharPropIds(const SfxItemSet& rSet) return aCharWhichIds; } -std::vector<sal_uInt16> GetAllCharPropIds(o3tl::span< const SfxPoolItem* const > aChangedItems) +std::vector<sal_uInt16> GetAllCharPropIds(std::span< const SfxPoolItem* const > aChangedItems) { std::vector<sal_uInt16> aCharWhichIds; for (const SfxPoolItem* pItem : aChangedItems) diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index a63c9e757b8b..1bad74cebb70 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -200,8 +200,8 @@ namespace aDXArray.push_back(m_rInfo.mpDXArray[nStartOffset + i] - nStartX); auto aKashidaArray = !m_rInfo.mpKashidaArray.empty() ? - o3tl::span<const sal_Bool>(m_rInfo.mpKashidaArray.data() + nStartOffset, nSpanLen) : - o3tl::span<const sal_Bool>(); + std::span<const sal_Bool>(m_rInfo.mpKashidaArray.data() + nStartOffset, nSpanLen) : + std::span<const sal_Bool>(); DrawPortionInfo aInfo(aStartPos, rSpanTxt, nSpanIdx, nSpanLen, diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 93d6ea938cc7..ea8e75efe3e5 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -183,7 +183,7 @@ SdrText* CellTextProvider::getText(sal_Int32 nIndex) const { } - void CellProperties::ItemSetChanged(o3tl::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) + void CellProperties::ItemSetChanged(std::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich) { SdrTextObj& rObj = static_cast<SdrTextObj&>(GetSdrObject()); diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 13c375f7f040..d43b8241cc66 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -53,7 +53,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::beans::PropertyAttribute; using ::com::sun::star::drawing::TextVerticalAdjust; -static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxShapePropertyMap() +static std::span<SfxItemPropertyMapEntry const> ImplGetSvxShapePropertyMap() { static SfxItemPropertyMapEntry const aShapePropertyMap_Impl[] = { @@ -77,7 +77,7 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxShapePropertyMap() return aShapePropertyMap_Impl; } -static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxTextShapePropertyMap() +static std::span<SfxItemPropertyMapEntry const> ImplGetSvxTextShapePropertyMap() { static SfxItemPropertyMapEntry const aTextShapePropertyMap_Impl[] = { @@ -101,7 +101,7 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxTextShapePropertyMap( return aTextShapePropertyMap_Impl; } -static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxConnectorPropertyMap() +static std::span<SfxItemPropertyMapEntry const> ImplGetSvxConnectorPropertyMap() { static SfxItemPropertyMapEntry const aConnectorPropertyMap_Impl[] = { @@ -126,7 +126,7 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxConnectorPropertyMap( return aConnectorPropertyMap_Impl; } -static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxDimensioningPropertyMap() +static std::span<SfxItemPropertyMapEntry const> ImplGetSvxDimensioningPropertyMap() { static SfxItemPropertyMapEntry const aDimensioningPropertyMap_Impl[] = { @@ -151,7 +151,7 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxDimensioningPropertyM return aDimensioningPropertyMap_Impl; } -static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxCirclePropertyMap() +static std::span<SfxItemPropertyMapEntry const> ImplGetSvxCirclePropertyMap() { static SfxItemPropertyMapEntry const aCirclePropertyMap_Impl[] = { @@ -176,7 +176,7 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxCirclePropertyMap() return aCirclePropertyMap_Impl; } -static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxPolyPolygonPropertyMap() +static std::span<SfxItemPropertyMapEntry const> ImplGetSvxPolyPolygonPropertyMap() { static SfxItemPropertyMapEntry const aPolyPolygonPropertyMap_Impl[] = { @@ -203,7 +203,7 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxPolyPolygonPropertyMa return aPolyPolygonPropertyMap_Impl; } -static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxGraphicObjectPropertyMap() +static std::span<SfxItemPropertyMapEntry const> ImplGetSvxGraphicObjectPropertyMap() { static SfxItemPropertyMapEntry const aGraphicObjectPropertyMap_Impl[] = { @@ -235,7 +235,7 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxGraphicObjectProperty return aGraphicObjectPropertyMap_Impl; } -static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvx3DSceneObjectPropertyMap() +static std::span<SfxItemPropertyMapEntry const> ImplGetSvx3DSceneObjectPropertyMap() { static SfxItemPropertyMapEntry const a3DSceneObjectPropertyMap_Impl[] = { @@ -252,7 +252,7 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvx3DSceneObjectProperty return a3DSceneObjectPropertyMap_Impl; } -static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvx3DCubeObjectPropertyMap() +static std::span<SfxItemPropertyMapEntry const> ImplGetSvx3DCubeObjectPropertyMap() { static SfxItemPropertyMapEntry const a3DCubeObjectPropertyMap_Impl[] = { @@ -272,7 +272,7 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvx3DCubeObjectPropertyM return a3DCubeObjectPropertyMap_Impl; } -static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvx3DSphereObjectPropertyMap() +static std::span<SfxItemPropertyMapEntry const> ImplGetSvx3DSphereObjectPropertyMap() { static SfxItemPropertyMapEntry const a3DSphereObjectPropertyMap_Impl[] = { @@ -291,7 +291,7 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvx3DSphereObjectPropert return a3DSphereObjectPropertyMap_Impl; } -static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvx3DLatheObjectPropertyMap() +static std::span<SfxItemPropertyMapEntry const> ImplGetSvx3DLatheObjectPropertyMap() { static SfxItemPropertyMapEntry const a3DLatheObjectPropertyMap_Impl[] = { @@ -316,7 +316,7 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvx3DLatheObjectProperty return a3DLatheObjectPropertyMap_Impl; } -static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvx3DExtrudeObjectPropertyMap() +static std::span<SfxItemPropertyMapEntry const> ImplGetSvx3DExtrudeObjectPropertyMap() { static SfxItemPropertyMapEntry const a3DExtrudeObjectPropertyMap_Impl[] = { @@ -341,7 +341,7 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvx3DExtrudeObjectProper return a3DExtrudeObjectPropertyMap_Impl; } -static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvx3DPolygonObjectPropertyMap() +static std::span<SfxItemPropertyMapEntry const> ImplGetSvx3DPolygonObjectPropertyMap() { static SfxItemPropertyMapEntry const a3DPolygonObjectPropertyMap_Impl[] = { @@ -361,7 +361,7 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvx3DPolygonObjectProper return a3DPolygonObjectPropertyMap_Impl; } -static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxAllPropertyMap() +static std::span<SfxItemPropertyMapEntry const> ImplGetSvxAllPropertyMap() { static SfxItemPropertyMapEntry const aAllPropertyMap_Impl[] = { @@ -404,7 +404,7 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxAllPropertyMap() return aAllPropertyMap_Impl; } -static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxGroupPropertyMap() +static std::span<SfxItemPropertyMapEntry const> ImplGetSvxGroupPropertyMap() { static SfxItemPropertyMapEntry const aGroupPropertyMap_Impl[] = { @@ -416,7 +416,7 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxGroupPropertyMap() return aGroupPropertyMap_Impl; } -static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxOle2PropertyMap() +static std::span<SfxItemPropertyMapEntry const> ImplGetSvxOle2PropertyMap() { static SfxItemPropertyMapEntry const aOle2PropertyMap_Impl[] = { @@ -450,7 +450,7 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxOle2PropertyMap() return aOle2PropertyMap_Impl; } -static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxPluginPropertyMap() +static std::span<SfxItemPropertyMapEntry const> ImplGetSvxPluginPropertyMap() { static SfxItemPropertyMapEntry const aPluginPropertyMap_Impl[] = { @@ -481,7 +481,7 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxPluginPropertyMap() return aPluginPropertyMap_Impl; } -static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxFramePropertyMap() +static std::span<SfxItemPropertyMapEntry const> ImplGetSvxFramePropertyMap() { //TODO/LATER: new properties for ScrollingMode and DefaultBorder static SfxItemPropertyMapEntry const aFramePropertyMap_Impl[] = @@ -516,7 +516,7 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxFramePropertyMap() return aFramePropertyMap_Impl; } -static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxAppletPropertyMap() +static std::span<SfxItemPropertyMapEntry const> ImplGetSvxAppletPropertyMap() { static SfxItemPropertyMapEntry const aAppletPropertyMap_Impl[] = { @@ -550,7 +550,7 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxAppletPropertyMap() return aAppletPropertyMap_Impl; } -static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxControlShapePropertyMap() +static std::span<SfxItemPropertyMapEntry const> ImplGetSvxControlShapePropertyMap() { static SfxItemPropertyMapEntry const aControlPropertyMap_Impl[] = { @@ -611,7 +611,7 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxControlShapePropertyM return aControlPropertyMap_Impl; } -static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxPageShapePropertyMap() +static std::span<SfxItemPropertyMapEntry const> ImplGetSvxPageShapePropertyMap() { static SfxItemPropertyMapEntry const aPageShapePropertyMap_Impl[] = { @@ -634,7 +634,7 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxPageShapePropertyMap( return aPageShapePropertyMap_Impl; } -static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxCaptionPropertyMap() +static std::span<SfxItemPropertyMapEntry const> ImplGetSvxCaptionPropertyMap() { static SfxItemPropertyMapEntry const aCaptionPropertyMap_Impl[] = { @@ -667,7 +667,7 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxCaptionPropertyMap() return aCaptionPropertyMap_Impl; } -static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxCustomShapePropertyMap() +static std::span<SfxItemPropertyMapEntry const> ImplGetSvxCustomShapePropertyMap() { static SfxItemPropertyMapEntry const aCustomShapePropertyMap_Impl[] = { @@ -691,7 +691,7 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxCustomShapePropertyMa return aCustomShapePropertyMap_Impl; } -static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxMediaShapePropertyMap() +static std::span<SfxItemPropertyMapEntry const> ImplGetSvxMediaShapePropertyMap() { static SfxItemPropertyMapEntry const aMediaShapePropertyMap_Impl[] = { @@ -726,7 +726,7 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxMediaShapePropertyMap return aMediaShapePropertyMap_Impl; } -static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxTableShapePropertyMap() +static std::span<SfxItemPropertyMapEntry const> ImplGetSvxTableShapePropertyMap() { static SfxItemPropertyMapEntry const aTableShapePropertyMap_Impl[] = { @@ -759,7 +759,7 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxTableShapePropertyMap return aTableShapePropertyMap_Impl; } -static o3tl::span<comphelper::PropertyMapEntry const> ImplGetSvxDrawingDefaultsPropertyMap() +static std::span<comphelper::PropertyMapEntry const> ImplGetSvxDrawingDefaultsPropertyMap() { static comphelper::PropertyMapEntry const aSvxDrawingDefaultsPropertyMap_Impl[] = { @@ -780,7 +780,7 @@ static o3tl::span<comphelper::PropertyMapEntry const> ImplGetSvxDrawingDefaultsP return aSvxDrawingDefaultsPropertyMap_Impl; } -static o3tl::span<comphelper::PropertyMapEntry const> ImplGetAdditionalWriterDrawingDefaultsPropertyMap() +static std::span<comphelper::PropertyMapEntry const> ImplGetAdditionalWriterDrawingDefaultsPropertyMap() { static comphelper::PropertyMapEntry const aSvxAdditionalDefaultsPropertyMap_Impl[] = { @@ -883,7 +883,7 @@ SvxUnoPropertyMapProvider::~SvxUnoPropertyMapProvider() } -o3tl::span<const SfxItemPropertyMapEntry> SvxUnoPropertyMapProvider::GetMap(sal_uInt16 nPropertyId) +std::span<const SfxItemPropertyMapEntry> SvxUnoPropertyMapProvider::GetMap(sal_uInt16 nPropertyId) { assert(nPropertyId < SVXMAP_END); if(aMapArr[nPropertyId].empty()) { diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 96d34a601f27..c583bbb7111c 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -1791,7 +1791,7 @@ void SvxCustomShape::createCustomShapeDefaults( const OUString& rValueType ) static_cast<SdrObjCustomShape*>(GetSdrObject())->MergeDefaultAttributes( &rValueType ); } -SvxShapeGroupAnyD::SvxShapeGroupAnyD( SdrObject* pObject, o3tl::span<const SfxItemPropertyMapEntry> pEntries, const SvxItemPropertySet* pPropertySet ) +SvxShapeGroupAnyD::SvxShapeGroupAnyD( SdrObject* pObject, std::span<const SfxItemPropertyMapEntry> pEntries, const SvxItemPropertySet* pPropertySet ) : SvxShape(pObject, pEntries, pPropertySet) {} diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index 563d8f290c5e..9e1f265dce2b 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -71,7 +71,7 @@ SvxOle2Shape::SvxOle2Shape(SdrObject* pObject, OUString referer) { } -SvxOle2Shape::SvxOle2Shape(SdrObject* pObject, OUString referer, o3tl::span<const SfxItemPropertyMapEntry> pPropertyMap, const SvxItemPropertySet* pPropertySet) +SvxOle2Shape::SvxOle2Shape(SdrObject* pObject, OUString referer, std::span<const SfxItemPropertyMapEntry> pPropertyMap, const SvxItemPropertySet* pPropertySet) : SvxShapeText(pObject, pPropertyMap, pPropertySet) , referer_(std::move(referer)) { diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 8b3155ad2382..949728d4bf12 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -171,7 +171,7 @@ SvxShape::SvxShape( SdrObject* pObject ) } -SvxShape::SvxShape( SdrObject* pObject, o3tl::span<const SfxItemPropertyMapEntry> pEntries, const SvxItemPropertySet* pPropertySet ) +SvxShape::SvxShape( SdrObject* pObject, std::span<const SfxItemPropertyMapEntry> pEntries, const SvxItemPropertySet* pPropertySet ) : maSize(100,100) , mpImpl( new SvxShapeImpl ) , mbIsMultiPropertyCall(false) @@ -3766,7 +3766,7 @@ SvxShapeText::SvxShapeText(SdrObject* pObject) } -SvxShapeText::SvxShapeText(SdrObject* pObject, o3tl::span<const SfxItemPropertyMapEntry> pPropertyMap, const SvxItemPropertySet* pPropertySet) +SvxShapeText::SvxShapeText(SdrObject* pObject, std::span<const SfxItemPropertyMapEntry> pPropertyMap, const SvxItemPropertySet* pPropertySet) : SvxShape( pObject, pPropertyMap, pPropertySet ), SvxUnoTextBase( ImplGetSvxUnoOutlinerTextCursorSvxPropertySet() ) { if( pObject ) |