summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
Diffstat (limited to 'sd')
-rw-r--r--sd/inc/pch/precompiled_sd.hxx2
-rw-r--r--sd/inc/pch/precompiled_sdui.hxx2
-rw-r--r--sd/inc/sdmod.hxx6
-rw-r--r--sd/source/ui/inc/DrawDocShell.hxx9
-rw-r--r--sd/source/ui/slideshow/slideshow.cxx2
-rw-r--r--sd/source/ui/unoidl/unoobj.cxx16
-rw-r--r--sd/source/ui/unoidl/unoobj.hxx2
-rw-r--r--sd/source/ui/unoidl/unosrch.cxx2
8 files changed, 22 insertions, 19 deletions
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index b4110da7f641..44aba021a613 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -43,6 +43,7 @@
#include <optional>
#include <ostream>
#include <set>
+#include <span>
#include <stddef.h>
#include <string_view>
#include <type_traits>
@@ -354,7 +355,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/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx
index 32614ba525a1..b74e188d61d5 100644
--- a/sd/inc/pch/precompiled_sdui.hxx
+++ b/sd/inc/pch/precompiled_sdui.hxx
@@ -47,6 +47,7 @@
#include <optional>
#include <ostream>
#include <set>
+#include <span>
#include <stddef.h>
#include <stdexcept>
#include <string.h>
@@ -384,7 +385,6 @@
#include <o3tl/hash_combine.hxx>
#include <o3tl/safeint.hxx>
#include <o3tl/sorted_vector.hxx>
-#include <o3tl/span.hxx>
#include <o3tl/strong_int.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <o3tl/underlyingenumvalue.hxx>
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index 4fca79b04b13..e1a2c51b6446 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -31,9 +31,9 @@
#include <sfx2/module.hxx>
#include <sal/types.h>
#include <vcl/virdev.hxx>
-#include <o3tl/span.hxx>
#include <map>
#include <memory>
+#include <span>
#include <string_view>
class SdOptions;
@@ -59,13 +59,13 @@ enum class SdOptionStreamMode
struct SdExtPropertySetInfoCacheCompare
{
- bool operator()(const o3tl::span<SfxItemPropertyMapEntry const>& lhs, const o3tl::span<SfxItemPropertyMapEntry const>& rhs) const
+ bool operator()(const std::span<SfxItemPropertyMapEntry const>& lhs, const std::span<SfxItemPropertyMapEntry const>& rhs) const
{
return lhs.data() < rhs.data();
}
};
typedef std::map<
- o3tl::span<SfxItemPropertyMapEntry const>,
+ std::span<SfxItemPropertyMapEntry const>,
css::uno::Reference<css::beans::XPropertySetInfo>,
SdExtPropertySetInfoCacheCompare > SdExtPropertySetInfoCache;
typedef std::map< SdrObjKind, css::uno::Sequence< css::uno::Type> > SdTypesCache;
diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx
index 4b21acae84f0..b53debc7dcbe 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -19,7 +19,10 @@
#pragma once
-#include <o3tl/span.hxx>
+#include <sal/config.h>
+
+#include <span>
+
#include <sfx2/docfac.hxx>
#include <sfx2/objsh.hxx>
#include <svl/style.hxx>
@@ -145,7 +148,7 @@ public:
*/
bool CheckPageName(weld::Window* pWin, OUString& rName );
- void SetSlotFilter(bool bEnable = false, o3tl::span<sal_uInt16 const> pSIDs = o3tl::span<sal_uInt16 const>()) { mbFilterEnable = bEnable; mpFilterSIDs = pSIDs; }
+ void SetSlotFilter(bool bEnable = false, std::span<sal_uInt16 const> pSIDs = std::span<sal_uInt16 const>()) { mbFilterEnable = bEnable; mpFilterSIDs = pSIDs; }
void ApplySlotFilter() const;
SfxStyleFamily GetStyleFamily() const { return mnStyleFamily; }
@@ -214,7 +217,7 @@ private:
std::unique_ptr<FontList> mpFontList;
DocumentType meDocType;
SfxStyleFamily mnStyleFamily;
- o3tl::span<sal_uInt16 const>
+ std::span<sal_uInt16 const>
mpFilterSIDs;
bool mbFilterEnable;
bool mbSdDataObj;
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 52df32b41954..52f66d5afdea 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -104,7 +104,7 @@ namespace {
};
}
-static o3tl::span<const SfxItemPropertyMapEntry> ImplGetPresentationPropertyMap()
+static std::span<const SfxItemPropertyMapEntry> ImplGetPresentationPropertyMap()
{
// NOTE: First member must be sorted
static const SfxItemPropertyMapEntry aPresentationPropertyMap_Impl[] =
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 2f463f101a4a..114b60f02475 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -129,7 +129,7 @@ using ::com::sun::star::drawing::XShape;
{ u"NavigationOrder"_ustr, WID_NAVORDER, cppu::UnoType<sal_Int32>::get(), 0, 0},\
{ u"PlaceholderText"_ustr, WID_PLACEHOLDERTEXT, cppu::UnoType<OUString>::get(), 0, 0},\
- static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetImpress_SdXShapePropertyGraphicMap_Impl()
+ static std::span<const SfxItemPropertyMapEntry> lcl_GetImpress_SdXShapePropertyGraphicMap_Impl()
{
static const SfxItemPropertyMapEntry aImpress_SdXShapePropertyGraphicMap_Impl[] =
{
@@ -139,7 +139,7 @@ using ::com::sun::star::drawing::XShape;
return aImpress_SdXShapePropertyGraphicMap_Impl;
}
- static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetImpress_SdXShapePropertySimpleMap_Impl()
+ static std::span<const SfxItemPropertyMapEntry> lcl_GetImpress_SdXShapePropertySimpleMap_Impl()
{
static const SfxItemPropertyMapEntry aImpress_SdXShapePropertySimpleMap_Impl[] =
{
@@ -154,7 +154,7 @@ using ::com::sun::star::drawing::XShape;
{ u"" UNO_NAME_OBJ_STYLE ""_ustr, WID_STYLE, cppu::UnoType<style::XStyle>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0},\
{ u"NavigationOrder"_ustr, WID_NAVORDER, cppu::UnoType<sal_Int32>::get(), 0, 0},\
- static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetDraw_SdXShapePropertySimpleMap_Impl()
+ static std::span<const SfxItemPropertyMapEntry> lcl_GetDraw_SdXShapePropertySimpleMap_Impl()
{
static const SfxItemPropertyMapEntry aDraw_SdXShapePropertyMap_Impl[] =
{
@@ -162,7 +162,7 @@ using ::com::sun::star::drawing::XShape;
};
return aDraw_SdXShapePropertyMap_Impl;
}
- static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetDraw_SdXShapePropertyGraphicMap_Impl()
+ static std::span<const SfxItemPropertyMapEntry> lcl_GetDraw_SdXShapePropertyGraphicMap_Impl()
{
static const SfxItemPropertyMapEntry aDraw_SdXShapePropertyGraphicMap_Impl[] =
{
@@ -171,9 +171,9 @@ using ::com::sun::star::drawing::XShape;
};
return aDraw_SdXShapePropertyGraphicMap_Impl;
}
- static o3tl::span<const SfxItemPropertyMapEntry> lcl_ImplGetShapePropertyMap( bool bImpress, bool bGraphicObj )
+ static std::span<const SfxItemPropertyMapEntry> lcl_ImplGetShapePropertyMap( bool bImpress, bool bGraphicObj )
{
- o3tl::span<const SfxItemPropertyMapEntry> pRet;
+ std::span<const SfxItemPropertyMapEntry> pRet;
if( bImpress )
{
if( bGraphicObj )
@@ -222,7 +222,7 @@ using ::com::sun::star::drawing::XShape;
}
return pRet;
}
- static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetEmpty_SdXShapePropertyMap_Impl()
+ static std::span<const SfxItemPropertyMapEntry> lcl_GetEmpty_SdXShapePropertyMap_Impl()
{
return {};
}
@@ -378,7 +378,7 @@ uno::Any SAL_CALL SdXShape::getPropertyDefault( const OUString& aPropertyName )
//XPropertySet
css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL SdXShape::getPropertySetInfo()
{
- o3tl::span<SfxItemPropertyMapEntry const> nObjId = mpShape->getPropertyMapEntries();
+ std::span<SfxItemPropertyMapEntry const> nObjId = mpShape->getPropertyMapEntries();
css::uno::Reference<css::beans::XPropertySetInfo> pInfo;
SdExtPropertySetInfoCache& rCache = (mpModel && mpModel->IsImpressDocument()) ?
diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx
index 407f5491a15a..7c78bc520dcd 100644
--- a/sd/source/ui/unoidl/unoobj.hxx
+++ b/sd/source/ui/unoidl/unoobj.hxx
@@ -38,7 +38,7 @@ class SdXShape : public SvxShapeMaster,
private:
SvxShape* mpShape;
const SvxItemPropertySet* mpPropSet;
- o3tl::span<const SfxItemPropertyMapEntry> mpMap;
+ std::span<const SfxItemPropertyMapEntry> mpMap;
SdXImpressDocument* mpModel;
/// @throws css::lang::IllegalArgumentException
diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx
index 5a071f1fde4f..6f93ed4c61c9 100644
--- a/sd/source/ui/unoidl/unosrch.cxx
+++ b/sd/source/ui/unoidl/unosrch.cxx
@@ -41,7 +41,7 @@ using namespace ::com::sun::star;
#define WID_SEARCH_CASE 1
#define WID_SEARCH_WORDS 2
-static o3tl::span<const SfxItemPropertyMapEntry> ImplGetSearchPropertyMap()
+static std::span<const SfxItemPropertyMapEntry> ImplGetSearchPropertyMap()
{
static const SfxItemPropertyMapEntry aSearchPropertyMap_Impl[] =
{
generated by cgit (git 2.34.1) at 2024-07-10 03:56:40 +0000