diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-07-21 12:34:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-07-25 10:00:23 +0200 |
| commit | 0351bec874f7e83c437e485e8d61a41f32718e25 (patch) | |
| tree | 463fa37a7d8a9c990edb80e8f9cf726002c8aa4d | |
| parent | 9700c1b2170ad04453a361ed5647937833ac3c18 (diff) | |
use more o3tl::span
which means we can reserve precisely the right number of entries when
building maps
Change-Id: I580414699289369de4730caae09829bbd8759e82
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137292
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
71 files changed, 212 insertions, 450 deletions
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx index f55b0637dc8a..17411c95f647 100644 --- a/chart2/source/tools/ErrorBar.cxx +++ b/chart2/source/tools/ErrorBar.cxx @@ -68,7 +68,6 @@ const SfxItemPropertySet* GetErrorBarPropertySet() {u"LineColor",12,cppu::UnoType<css::util::Color>::get(),0,0}, {u"LineTransparence",13,cppu::UnoType<sal_Int16>::get(),0,0}, {u"LineJoint",14,cppu::UnoType<css::drawing::LineJoint>::get(),0,0}, - { u"", 0, css::uno::Type(), 0, 0 } }; static SfxItemPropertySet aPropSet( aErrorBarPropertyMap_Impl ); return &aPropSet; diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index df32457ecd5c..5d4d833a19a0 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -94,7 +94,6 @@ namespace accessibility SVX_UNOEDIT_NUMBERING_PROPERTY, { u"TextUserDefinedAttributes", EE_CHAR_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; static SvxItemPropertySet aPropSet( aPropMap, EditEngine::GetGlobalItemPool() ); return &aPropSet; diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx index c3317f6c9287..022386fe3f0b 100644 --- a/editeng/source/uno/unofield.cxx +++ b/editeng/source/uno/unofield.cxx @@ -81,40 +81,31 @@ static const SfxItemPropertySet* ImplGetFieldItemPropertySet( sal_Int32 mnId ) { UNO_TC_PROP_IS_FIXED, WID_BOOL1, cppu::UnoType<bool>::get(), 0, 0 }, { UNO_TC_PROP_IS_DATE, WID_BOOL2, cppu::UnoType<bool>::get(), 0, 0 }, { UNO_TC_PROP_NUMFORMAT, WID_INT32, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; static const SfxItemPropertySet aExDateTimeFieldPropertySet_Impl(aExDateTimeFieldPropertyMap_Impl); static const SfxItemPropertyMapEntry aDateTimeFieldPropertyMap_Impl[] = { { UNO_TC_PROP_IS_DATE, WID_BOOL2, cppu::UnoType<bool>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; static const SfxItemPropertySet aDateTimeFieldPropertySet_Impl(aDateTimeFieldPropertyMap_Impl); static const SfxItemPropertyMapEntry aUrlFieldPropertyMap_Impl[] = { - { UNO_TC_PROP_URL_FORMAT, WID_INT16, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, { UNO_TC_PROP_URL_REPRESENTATION, WID_STRING1, ::cppu::UnoType<OUString>::get(), 0, 0 }, { UNO_TC_PROP_URL_TARGET, WID_STRING2, ::cppu::UnoType<OUString>::get(), 0, 0 }, { UNO_TC_PROP_URL, WID_STRING3, ::cppu::UnoType<OUString>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; static const SfxItemPropertySet aUrlFieldPropertySet_Impl(aUrlFieldPropertyMap_Impl); - static const SfxItemPropertyMapEntry aEmptyPropertyMap_Impl[] = - { - { u"", 0, css::uno::Type(), 0, 0 } - }; - static const SfxItemPropertySet aEmptyPropertySet_Impl(aEmptyPropertyMap_Impl); + static const SfxItemPropertySet aEmptyPropertySet_Impl({}); static const SfxItemPropertyMapEntry aExtFileFieldPropertyMap_Impl[] = { { UNO_TC_PROP_IS_FIXED, WID_BOOL1, cppu::UnoType<bool>::get(), 0, 0 }, { UNO_TC_PROP_FILE_FORMAT, WID_INT16, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, { UNO_TC_PROP_CURRENT_PRESENTATION, WID_STRING1, ::cppu::UnoType<OUString>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; static const SfxItemPropertySet aExtFileFieldPropertySet_Impl(aExtFileFieldPropertyMap_Impl); @@ -125,14 +116,12 @@ static const SfxItemPropertySet* ImplGetFieldItemPropertySet( sal_Int32 mnId ) { UNO_TC_PROP_AUTHOR_CONTENT, WID_STRING2,::cppu::UnoType<OUString>::get(), 0, 0 }, { UNO_TC_PROP_AUTHOR_FORMAT, WID_INT16, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, { UNO_TC_PROP_AUTHOR_FULLNAME, WID_BOOL2, cppu::UnoType<bool>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; static const SfxItemPropertySet aAuthorFieldPropertySet_Impl(aAuthorFieldPropertyMap_Impl); static const SfxItemPropertyMapEntry aMeasureFieldPropertyMap_Impl[] = { { UNO_TC_PROP_MEASURE_KIND, WID_INT16, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; static const SfxItemPropertySet aMeasureFieldPropertySet_Impl(aMeasureFieldPropertyMap_Impl); @@ -143,7 +132,6 @@ static const SfxItemPropertySet* ImplGetFieldItemPropertySet( sal_Int32 mnId ) { UNO_TC_PROP_IS_FIXED, WID_BOOL1, cppu::UnoType<bool>::get(), 0, 0 }, { UNO_TC_PROP_NUMFORMAT, WID_INT32, cppu::UnoType<sal_Int32>::get(), 0, 0 }, { UNO_TC_PROP_IS_FIXED_LANGUAGE, WID_BOOL2, cppu::UnoType<bool>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; static const SfxItemPropertySet aDocInfoCustomFieldPropertySet_Impl(aDocInfoCustomFieldPropertyMap_Impl); diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx index 2aa7e5746cbc..5ac72ee1ca6a 100644 --- a/editeng/source/uno/unoipset.cxx +++ b/editeng/source/uno/unoipset.cxx @@ -31,7 +31,7 @@ using namespace ::com::sun::star; -SvxItemPropertySet::SvxItemPropertySet( const SfxItemPropertyMapEntry* pMap, SfxItemPool& rItemPool ) +SvxItemPropertySet::SvxItemPropertySet( o3tl::span<const SfxItemPropertyMapEntry> pMap, SfxItemPool& rItemPool ) : m_aPropertyMap( pMap ), mrItemPool( rItemPool ) { diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index 14a7c9f9ef04..e0ca965c5d3f 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -79,7 +79,7 @@ const SvxItemPropertySet* ImplGetSvxUnoOutlinerTextCursorSvxPropertySet() return &aTextCursorSvxPropertySet; } -const SfxItemPropertyMapEntry* ImplGetSvxTextPortionPropertyMap() +o3tl::span<const SfxItemPropertyMapEntry> ImplGetSvxTextPortionPropertyMap() { // Propertymap for an Outliner Text static const SfxItemPropertyMapEntry aSvxTextPortionPropertyMap[] = @@ -92,7 +92,6 @@ const SfxItemPropertyMapEntry* ImplGetSvxTextPortionPropertyMap() { u"TextPortionType", WID_PORTIONTYPE, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0 }, { u"TextUserDefinedAttributes", EE_CHAR_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aSvxTextPortionPropertyMap; } @@ -108,7 +107,7 @@ static const SfxItemPropertySet* ImplGetSvxTextPortionSfxPropertySet() return &aSvxTextPortionSfxPropertySet; } -const SfxItemPropertyMapEntry* ImplGetSvxUnoOutlinerTextCursorPropertyMap() +o3tl::span<const SfxItemPropertyMapEntry> ImplGetSvxUnoOutlinerTextCursorPropertyMap() { // Propertymap for an Outliner Text static const SfxItemPropertyMapEntry aSvxUnoOutlinerTextCursorPropertyMap[] = @@ -119,7 +118,6 @@ const SfxItemPropertyMapEntry* ImplGetSvxUnoOutlinerTextCursorPropertyMap() SVX_UNOEDIT_PARA_PROPERTIES, { u"TextUserDefinedAttributes", EE_CHAR_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aSvxUnoOutlinerTextCursorPropertyMap; diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx index ae57bd84ce55..89d5b49cbaa9 100644 --- a/editeng/source/xml/xmltxtexp.cxx +++ b/editeng/source/xml/xmltxtexp.cxx @@ -279,7 +279,6 @@ SvxXMLTextExportComponent::SvxXMLTextExportComponent( { UNO_NAME_NUMBERING, EE_PARA_BULLETSTATE,cppu::UnoType<bool>::get(), 0, 0 }, { UNO_NAME_NUMBERING_LEVEL, EE_PARA_OUTLLEVEL, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, SVX_UNOEDIT_PARA_PROPERTIES, - { u"", 0, css::uno::Type(), 0, 0 } }; static SvxItemPropertySet aSvxXMLTextExportComponentPropertySet( SvxXMLTextExportComponentPropertyMap, EditEngine::GetGlobalItemPool() ); diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx index 1122ea473b6f..d04e37a822bf 100644 --- a/editeng/source/xml/xmltxtimp.cxx +++ b/editeng/source/xml/xmltxtimp.cxx @@ -142,7 +142,6 @@ EditPaM SvxReadXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection { UNO_NAME_NUMBERING, EE_PARA_BULLETSTATE,cppu::UnoType<bool>::get(), 0, 0 }, { UNO_NAME_NUMBERING_LEVEL, EE_PARA_OUTLLEVEL, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, SVX_UNOEDIT_PARA_PROPERTIES, - { u"", 0, css::uno::Type(), 0, 0 } }; static SvxItemPropertySet aSvxXMLTextImportComponentPropertySet( SvxXMLTextImportComponentPropertyMap, EditEngine::GetGlobalItemPool() ); diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index 82c08e007276..b6245bdd26de 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -515,7 +515,6 @@ Reference< XPropertySetInfo > BibliographyLoader::getPropertySetInfo() static const SfxItemPropertyMapEntry aBibProps_Impl[] = { { u"BibliographyDataFieldNames", 0, cppu::UnoType<Sequence<PropertyValue>>::get(), PropertyAttribute::READONLY, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; static Reference< XPropertySetInfo > xRet = SfxItemPropertySet(aBibProps_Impl).getPropertySetInfo(); diff --git a/forms/source/richtext/richtextunowrapper.cxx b/forms/source/richtext/richtextunowrapper.cxx index d9c4269216ea..fbf4b875e3af 100644 --- a/forms/source/richtext/richtextunowrapper.cxx +++ b/forms/source/richtext/richtextunowrapper.cxx @@ -51,7 +51,6 @@ namespace frm SVX_UNOEDIT_PARA_PROPERTIES, { u"TextUserDefinedAttributes", EE_CHAR_XMLATTRIBS, cppu::UnoType<XNameContainer>::get(), 0, 0 }, { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<XNameContainer>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; static SvxItemPropertySet aTextEnginePropertySet( aTextEnginePropertyMap, SdrObject::GetGlobalDrawObjectItemPool() ); return &aTextEnginePropertySet; diff --git a/include/editeng/unoipset.hxx b/include/editeng/unoipset.hxx index 5a0ac105c176..412fc9be2298 100644 --- a/include/editeng/unoipset.hxx +++ b/include/editeng/unoipset.hxx @@ -36,7 +36,7 @@ class EDITENG_DLLPUBLIC SvxItemPropertySet SfxItemPool& mrItemPool; public: - SvxItemPropertySet( const SfxItemPropertyMapEntry *pMap, SfxItemPool& rPool ); + SvxItemPropertySet( o3tl::span<const SfxItemPropertyMapEntry> pMap, SfxItemPool& rPool ); ~SvxItemPropertySet(); SvxItemPropertySet& operator=( SvxItemPropertySet const & ) = delete; // MSVC2015 workaround diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index 3c8f95368473..b91a6d3e4dc3 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -45,6 +45,7 @@ #include <cppuhelper/implbase1.hxx> #include <cppuhelper/weakagg.hxx> #include <osl/diagnose.hxx> +#include <o3tl/span.hxx> #include <mutex> #include <comphelper/servicehelper.hxx> #include <svl/itemset.hxx> @@ -668,9 +669,9 @@ public: }; EDITENG_DLLPUBLIC const SvxItemPropertySet* ImplGetSvxUnoOutlinerTextCursorSvxPropertySet(); -const SfxItemPropertyMapEntry* ImplGetSvxUnoOutlinerTextCursorPropertyMap(); +o3tl::span<const SfxItemPropertyMapEntry> ImplGetSvxUnoOutlinerTextCursorPropertyMap(); const SvxItemPropertySet* ImplGetSvxTextPortionSvxPropertySet(); -const SfxItemPropertyMapEntry* ImplGetSvxTextPortionPropertyMap(); +o3tl::span<const SfxItemPropertyMapEntry> ImplGetSvxTextPortionPropertyMap(); #endif diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx index 08207f1b173e..7160e7de7110 100644 --- a/include/svl/itemprop.hxx +++ b/include/svl/itemprop.hxx @@ -26,6 +26,7 @@ #include <svl/itemset.hxx> #include <svl/svldllapi.h> #include <o3tl/sorted_vector.hxx> +#include <o3tl/span.hxx> #include <string_view> #include <utility> @@ -80,7 +81,7 @@ class SVL_DLLPUBLIC SfxItemPropertyMap o3tl::sorted_vector< const SfxItemPropertyMapEntry*, SfxItemPropertyMapCompare > m_aMap; mutable css::uno::Sequence< css::beans::Property > m_aPropSeq; public: - SfxItemPropertyMap( const SfxItemPropertyMapEntry* pEntries ); + SfxItemPropertyMap( o3tl::span<const SfxItemPropertyMapEntry> pEntries ); SfxItemPropertyMap( const SfxItemPropertyMap& rSource ); ~SfxItemPropertyMap(); @@ -99,7 +100,7 @@ class SVL_DLLPUBLIC SfxItemPropertySet final mutable css::uno::Reference<css::beans::XPropertySetInfo> m_xInfo; public: - SfxItemPropertySet( const SfxItemPropertyMapEntry *pMap ) : + SfxItemPropertySet( o3tl::span<const SfxItemPropertyMapEntry> pMap ) : m_aMap(pMap) {} ~SfxItemPropertySet(); @@ -150,7 +151,7 @@ class SVL_DLLPUBLIC SfxItemPropertySetInfo final : public SfxItemPropertySetInfo public: SfxItemPropertySetInfo(const SfxItemPropertyMap &rMap ); - SfxItemPropertySetInfo(const SfxItemPropertyMapEntry *pEntries ); + SfxItemPropertySetInfo(o3tl::span<const SfxItemPropertyMapEntry> pEntries ); virtual ~SfxItemPropertySetInfo() override; virtual css::uno::Sequence< css::beans::Property > SAL_CALL @@ -179,7 +180,7 @@ class SVL_DLLPUBLIC SfxExtItemPropertySetInfo final : public SfxExtItemPropertyS { public: SfxExtItemPropertySetInfo( - const SfxItemPropertyMapEntry *pMap, + o3tl::span<const SfxItemPropertyMapEntry> pMap, const css::uno::Sequence<css::beans::Property>& rPropSeq ); virtual ~SfxExtItemPropertySetInfo() override; diff --git a/include/svx/unoprov.hxx b/include/svx/unoprov.hxx index f7ee83979f0d..204b737edd97 100644 --- a/include/svx/unoprov.hxx +++ b/include/svx/unoprov.hxx @@ -82,12 +82,12 @@ public: class SVXCORE_DLLPUBLIC SvxUnoPropertyMapProvider { - SfxItemPropertyMapEntry const * aMapArr[SVXMAP_END]; + o3tl::span<SfxItemPropertyMapEntry const> aMapArr[SVXMAP_END]; std::unique_ptr<SvxItemPropertySet> aSetArr[SVXMAP_END]; public: SvxUnoPropertyMapProvider(); ~SvxUnoPropertyMapProvider(); - const SfxItemPropertyMapEntry* GetMap(sal_uInt16 nPropertyId); + o3tl::span<const SfxItemPropertyMapEntry> GetMap(sal_uInt16 nPropertyId); const SvxItemPropertySet* GetPropertySet(sal_uInt16 nPropertyId, SfxItemPool& rPool); }; diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index 5b2b0940ad8f..923636d3b9c7 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -121,7 +121,7 @@ protected: const SvxItemPropertySet* mpPropSet; SvxItemPropertySetUsrAnys maUrsAnys; - const SfxItemPropertyMapEntry* maPropMapEntries; + o3tl::span<const SfxItemPropertyMapEntry> maPropMapEntries; private: ::tools::WeakReference< SdrObject > mpSdrObjectWeakReference; @@ -156,7 +156,7 @@ protected: /** used from the XActionLockable interface */ sal_uInt16 mnLockCount; - const SfxItemPropertyMapEntry* getPropertyMapEntries() const { return maPropMapEntries; } + o3tl::span<const SfxItemPropertyMapEntry> getPropertyMapEntries() const { return maPropMapEntries; } void updateShapeKind(); void endSetPropertyValues(); @@ -183,7 +183,7 @@ public: /// @throws css::uno::RuntimeException SvxShape( SdrObject* pObj ); /// @throws css::uno::RuntimeException - SvxShape( SdrObject* pObject, const SfxItemPropertyMapEntry* pEntries, const SvxItemPropertySet* pPropertySet ); + SvxShape( SdrObject* pObject, o3tl::span<const SfxItemPropertyMapEntry> pEntries, const SvxItemPropertySet* pPropertySet ); virtual ~SvxShape() noexcept override; // Internals @@ -362,7 +362,7 @@ protected: public: SvxShapeText(SdrObject* pObj); - SvxShapeText(SdrObject* pObject, const SfxItemPropertyMapEntry* pPropertyMap, const SvxItemPropertySet* pPropertySet); + SvxShapeText(SdrObject* pObject, o3tl::span<const SfxItemPropertyMapEntry> pPropertyMap, const SvxItemPropertySet* pPropertySet); virtual ~SvxShapeText() noexcept override; virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage ) override; @@ -417,7 +417,7 @@ class SVXCORE_DLLPUBLIC SvxShapeGroupAnyD : public SvxShape, public css::drawing::XShapes { public: - SvxShapeGroupAnyD( SdrObject* pObject, const SfxItemPropertyMapEntry* pEntries, const SvxItemPropertySet* pPropertySet ); + SvxShapeGroupAnyD( SdrObject* pObject, o3tl::span<const SfxItemPropertyMapEntry> pEntries, const SvxItemPropertySet* pPropertySet ); virtual ~SvxShapeGroupAnyD() noexcept override; virtual void SAL_CALL acquire() noexcept override @@ -613,7 +613,7 @@ protected: SvGlobalName GetClassName_Impl(OUString& rHexCLSID); public: SvxOle2Shape(SdrObject* pObj); - SvxOle2Shape(SdrObject* pObject, const SfxItemPropertyMapEntry* pPropertyMap, const SvxItemPropertySet* pPropertySet); + SvxOle2Shape(SdrObject* pObject, o3tl::span<const SfxItemPropertyMapEntry> pPropertyMap, const SvxItemPropertySet* pPropertySet); virtual ~SvxOle2Shape() noexcept override; bool createObject( const SvGlobalName &aClassName ); diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index 1a48789aeeed..f1cd69636a42 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -136,7 +136,7 @@ OUString LinguOptions::GetName( sal_Int32 nWID ) //! map must be sorted by first entry in alphabetical increasing order. -static const SfxItemPropertyMapEntry* lcl_GetLinguProps() +static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetLinguProps() { static const SfxItemPropertyMapEntry aLinguProps[] = { @@ -180,7 +180,6 @@ static const SfxItemPropertyMapEntry* lcl_GetLinguProps() cppu::UnoType<bool>::get(), 0, 0 }, { UPN_IS_WRAP_REVERSE, UPH_IS_WRAP_REVERSE, cppu::UnoType<bool>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; return aLinguProps; } diff --git a/sc/inc/optuno.hxx b/sc/inc/optuno.hxx index bf8fde3587ab..433dc7ec1898 100644 --- a/sc/inc/optuno.hxx +++ b/sc/inc/optuno.hxx @@ -39,7 +39,7 @@ class ScDocOptionsHelper { public: - static const SfxItemPropertyMapEntry* GetPropertyMap(); + static o3tl::span<const SfxItemPropertyMapEntry> GetPropertyMap(); static bool setPropertyValue( ScDocOptions& rOptions, const SfxItemPropertyMap& rPropMap, diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index cab605f69080..c9438671570d 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -1076,7 +1076,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPSource::getPropertySetInfo( { SC_UNO_DP_COLUMNFIELDCOUNT, 0, cppu::UnoType<sal_Int32>::get(), READONLY, 0 }, { SC_UNO_DP_DATAFIELDCOUNT, 0, cppu::UnoType<sal_Int32>::get(), READONLY, 0 }, { SC_UNO_DP_GRANDTOTAL_NAME, 0, cppu::UnoType<OUString>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; static uno::Reference<beans::XPropertySetInfo> aRef = new SfxItemPropertySetInfo( aDPSourceMap_Impl ); @@ -1407,7 +1406,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPDimension::getPropertySetIn { SC_UNO_DP_LAYOUTNAME, 0, cppu::UnoType<OUString>::get(), 0, 0 }, { SC_UNO_DP_FIELD_SUBTOTALNAME, 0, cppu::UnoType<OUString>::get(), 0, 0 }, { SC_UNO_DP_HAS_HIDDEN_MEMBER, 0, cppu::UnoType<bool>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; static uno::Reference<beans::XPropertySetInfo> aRef = new SfxItemPropertySetInfo( aDPDimensionMap_Impl ); @@ -2068,7 +2066,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPLevel::getPropertySetInfo() { SC_UNO_DP_SORTING, 0, cppu::UnoType<sheet::DataPilotFieldSortInfo>::get(), 0, 0 }, { SC_UNO_DP_SUBTOTAL, 0, cppu::UnoType<uno::Sequence<sheet::GeneralFunction>>::get(), 0, 0 }, { SC_UNO_DP_SUBTOTAL2, 0, cppu::UnoType<uno::Sequence<sal_Int16>>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; static uno::Reference<beans::XPropertySetInfo> aRef = new SfxItemPropertySetInfo( aDPLevelMap_Impl ); @@ -2536,7 +2533,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPMember::getPropertySetInfo( { SC_UNO_DP_POSITION, 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, { SC_UNO_DP_SHOWDETAILS, 0, cppu::UnoType<bool>::get(), 0, 0 }, { SC_UNO_DP_LAYOUTNAME, 0, cppu::UnoType<OUString>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; static uno::Reference<beans::XPropertySetInfo> aRef = new SfxItemPropertySetInfo( aDPMemberMap_Impl ); diff --git a/sc/source/ui/unoobj/PivotTableDataProvider.cxx b/sc/source/ui/unoobj/PivotTableDataProvider.cxx index f0a9cdb8e871..285444e11507 100644 --- a/sc/source/ui/unoobj/PivotTableDataProvider.cxx +++ b/sc/source/ui/unoobj/PivotTableDataProvider.cxx @@ -60,13 +60,12 @@ constexpr OUStringLiteral constIdCategories(u"categories"); constexpr OUStringLiteral constIdLabel(u"label"); constexpr OUStringLiteral constIdData(u"data"); -const SfxItemPropertyMapEntry* lcl_GetDataProviderPropertyMap() +o3tl::span<const SfxItemPropertyMapEntry> lcl_GetDataProviderPropertyMap() { static const SfxItemPropertyMapEntry aDataProviderPropertyMap_Impl[] = { { SC_UNONAME_INCLUDEHIDDENCELLS, 0, cppu::UnoType<bool>::get(), 0, 0 }, { SC_UNONAME_USE_INTERNAL_DATA_PROVIDER, 0, cppu::UnoType<bool>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; return aDataProviderPropertyMap_Impl; } diff --git a/sc/source/ui/unoobj/PivotTableDataSequence.cxx b/sc/source/ui/unoobj/PivotTableDataSequence.cxx index 03626dc84a8a..bf8989e4f35a 100644 --- a/sc/source/ui/unoobj/PivotTableDataSequence.cxx +++ b/sc/source/ui/unoobj/PivotTableDataSequence.cxx @@ -27,14 +27,13 @@ namespace sc SC_SIMPLE_SERVICE_INFO( PivotTableDataSequence, "PivotTableDataSequence", "com.sun.star.chart2.data.DataSequence") -static const SfxItemPropertyMapEntry* lcl_GetDataSequencePropertyMap() +static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetDataSequencePropertyMap() { static const SfxItemPropertyMapEntry aDataSequencePropertyMap_Impl[] = { { SC_UNONAME_HIDDENVALUES, 0, cppu::UnoType<uno::Sequence<sal_Int32>>::get(), 0, 0 }, { SC_UNONAME_ROLE, 0, cppu::UnoType<css::chart2::data::DataSequenceRole>::get(), 0, 0 }, { SC_UNONAME_INCLUDEHIDDENCELLS, 0, cppu::UnoType<bool>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; return aDataSequencePropertyMap_Impl; } diff --git a/sc/source/ui/unoobj/addruno.cxx b/sc/source/ui/unoobj/addruno.cxx index 177fa119c522..7a1c2b8b80b2 100644 --- a/sc/source/ui/unoobj/addruno.cxx +++ b/sc/source/ui/unoobj/addruno.cxx @@ -106,7 +106,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAddressConversionObj::getProp { SC_UNONAME_REFSHEET, 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, { SC_UNONAME_UIREPR, 0, cppu::UnoType<OUString>::get(), 0, 0 }, { SC_UNONAME_XLA1REPR, 0, cppu::UnoType<OUString>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; static uno::Reference<beans::XPropertySetInfo> aRef(new SfxItemPropertySetInfo( aPropertyMap )); return aRef; @@ -121,7 +120,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAddressConversionObj::getProp { SC_UNONAME_REFSHEET, 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, { SC_UNONAME_UIREPR, 0, cppu::UnoType<OUString>::get(), 0, 0 }, { SC_UNONAME_XLA1REPR, 0, cppu::UnoType<OUString>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; static uno::Reference<beans::XPropertySetInfo> aRef(new SfxItemPropertySetInfo( aPropertyMap )); return aRef; diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index ce0300628ae4..3dc34bc259e0 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 const SfxItemPropertyMapEntry* lcl_GetAutoFormatMap() +static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetAutoFormatMap() { static const SfxItemPropertyMapEntry aAutoFormatMap_Impl[] = { @@ -58,7 +58,6 @@ static const SfxItemPropertyMapEntry* lcl_GetAutoFormatMap() { SC_UNONAME_INCJUST, 0, cppu::UnoType<bool>::get(), 0, 0 }, { SC_UNONAME_INCNUM, 0, cppu::UnoType<bool>::get(), 0, 0 }, { SC_UNONAME_INCWIDTH, 0, cppu::UnoType<bool>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; return aAutoFormatMap_Impl; } @@ -66,7 +65,7 @@ static const SfxItemPropertyMapEntry* lcl_GetAutoFormatMap() //! number format (String/Language) ??? (in XNumberFormat only ReadOnly) //! table::TableBorder ??!? -static const SfxItemPropertyMapEntry* lcl_GetAutoFieldMap() +static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetAutoFieldMap() { static const SfxItemPropertyMapEntry aAutoFieldMap_Impl[] = { @@ -117,7 +116,6 @@ static const SfxItemPropertyMapEntry* lcl_GetAutoFieldMap() { SC_UNONAME_ROTREF, ATTR_ROTATE_MODE, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, { SC_UNONAME_CELLVJUS, ATTR_VER_JUSTIFY, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, { SC_UNONAME_CELLVJUS_METHOD, ATTR_VER_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; return aAutoFieldMap_Impl; } diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index 998d7ef50a7d..b7de3c764dda 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 const SfxItemPropertyMapEntry* lcl_GetSettingsPropertyMap() +static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetSettingsPropertyMap() { static const SfxItemPropertyMapEntry aSettingsPropertyMap_Impl[] = { @@ -74,7 +74,6 @@ static const SfxItemPropertyMapEntry* lcl_GetSettingsPropertyMap() { SC_UNONAME_PRMETRICS,0, cppu::UnoType<bool>::get(), 0, 0}, { SC_UNONAME_USETABCOL,0, cppu::UnoType<bool>::get(), 0, 0}, { SC_UNONAME_REPLWARN, 0, cppu::UnoType<bool>::get(), 0, 0}, - {u"", 0, css::uno::Type(), 0, 0 } }; return aSettingsPropertyMap_Impl; } diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index da10552151ea..e522daee55a7 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -247,7 +247,6 @@ static const SfxItemPropertySet* lcl_GetCellsPropertySet() { SC_UNONAME_WRITING, ATTR_WRITINGDIR, cppu::UnoType<sal_Int16>::get(), 0, 0 }, { SC_UNONAME_HYPERLINK, ATTR_HYPERLINK, cppu::UnoType<OUString>::get(), 0, 0 }, { SC_UNONAME_FORMATID, SC_WID_UNO_FORMATID, cppu::UnoType<sal_uInt64>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; static SfxItemPropertySet aCellsPropertySet( aCellsPropertyMap_Impl ); return &aCellsPropertySet; @@ -358,7 +357,6 @@ static const SfxItemPropertySet* lcl_GetRangePropertySet() { SC_UNONAME_CELLVJUS_METHOD, ATTR_VER_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, { SC_UNONAME_WRITING, ATTR_WRITINGDIR, cppu::UnoType<sal_Int16>::get(), 0, 0 }, { SC_UNONAME_FORMATID, SC_WID_UNO_FORMATID, cppu::UnoType<sal_uInt64>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; static SfxItemPropertySet aRangePropertySet( aRangePropertyMap_Impl ); return &aRangePropertySet; @@ -475,7 +473,6 @@ static const SfxItemPropertySet* lcl_GetCellPropertySet() { UNO_NAME_EDIT_CHAR_ESCAPEMENT, EE_CHAR_ESCAPEMENT, cppu::UnoType<sal_Int32>::get(), 0, 0 }, { SC_UNONAME_HYPERLINK, ATTR_HYPERLINK, cppu::UnoType<OUString>::get(), 0, 0 }, { SC_UNONAME_FORMATID, SC_WID_UNO_FORMATID, cppu::UnoType<sal_uInt64>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; static SfxItemPropertySet aCellPropertySet( aCellPropertyMap_Impl ); return &aCellPropertySet; @@ -590,7 +587,6 @@ static const SfxItemPropertySet* lcl_GetColumnPropertySet() { SC_UNONAME_CELLVJUS_METHOD, ATTR_VER_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, { SC_UNONAME_CELLWID, SC_WID_UNO_CELLWID, cppu::UnoType<sal_Int32>::get(), 0, 0 }, { SC_UNONAME_WRITING, ATTR_WRITINGDIR, cppu::UnoType<sal_Int16>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; static SfxItemPropertySet aColumnPropertySet( aColumnPropertyMap_Impl ); return &aColumnPropertySet; @@ -703,7 +699,6 @@ static const SfxItemPropertySet* lcl_GetRowPropertySet() { SC_UNONAME_CELLVJUS, ATTR_VER_JUSTIFY, cppu::UnoType<sal_Int32>::get(), 0, 0 }, { SC_UNONAME_CELLVJUS_METHOD, ATTR_VER_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, { SC_UNONAME_WRITING, ATTR_WRITINGDIR, cppu::UnoType<sal_Int16>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; static SfxItemPropertySet aRowPropertySet( aRowPropertyMap_Impl ); return &aRowPropertySet; @@ -828,13 +823,12 @@ static const SfxItemPropertySet* lcl_GetSheetPropertySet() { SC_UNONAME_TABCOLOR, SC_WID_UNO_TABCOLOR, cppu::UnoType<sal_Int32>::get(), 0, 0 }, { SC_UNO_CODENAME, SC_WID_UNO_CODENAME, cppu::UnoType<OUString>::get(), 0, 0}, { SC_UNO_NAMEDRANGES, SC_WID_UNO_NAMES, cppu::UnoType<sheet::XNamedRanges>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; static SfxItemPropertySet aSheetPropertySet( aSheetPropertyMap_Impl ); return &aSheetPropertySet; } -static const SfxItemPropertyMapEntry* lcl_GetEditPropertyMap() +static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetEditPropertyMap() { static const SfxItemPropertyMapEntry aEditPropertyMap_Impl[] = { @@ -844,7 +838,6 @@ static const SfxItemPropertyMapEntry* lcl_GetEditPropertyMap() SVX_UNOEDIT_NUMBERING_PROPERTY, // for completeness of service ParagraphProperties { SC_UNONAME_TEXTUSER, EE_CHAR_XMLATTRIBS, cppu::UnoType<container::XNameContainer>::get(), 0, 0}, { SC_UNONAME_USERDEF, EE_PARA_XMLATTRIBS, cppu::UnoType<container::XNameContainer>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aEditPropertyMap_Impl; } diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index acbd5272b037..be2f2aa5e39d 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -79,25 +79,23 @@ using ::std::shared_ptr; namespace { -const SfxItemPropertyMapEntry* lcl_GetDataProviderPropertyMap() +o3tl::span<const SfxItemPropertyMapEntry> lcl_GetDataProviderPropertyMap() { static const SfxItemPropertyMapEntry aDataProviderPropertyMap_Impl[] = { { SC_UNONAME_INCLUDEHIDDENCELLS, 0, cppu::UnoType<bool>::get(), 0, 0 }, { SC_UNONAME_USE_INTERNAL_DATA_PROVIDER, 0, cppu::UnoType<bool>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; return aDataProviderPropertyMap_Impl; } -const SfxItemPropertyMapEntry* lcl_GetDataSequencePropertyMap() +o3tl::span<const SfxItemPropertyMapEntry> lcl_GetDataSequencePropertyMap() { static const SfxItemPropertyMapEntry aDataSequencePropertyMap_Impl[] = { { SC_UNONAME_HIDDENVALUES, 0, cppu::UnoType<uno::Sequence<sal_Int32>>::get(), 0, 0 }, { SC_UNONAME_ROLE, 0, cppu::UnoType<css::chart2::data::DataSequenceRole>::get(), 0, 0 }, { SC_UNONAME_INCLUDEHIDDENCELLS, 0, cppu::UnoType<bool>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; return aDataSequencePropertyMap_Impl; } diff --git a/sc/source/ui/unoobj/condformatuno.cxx b/sc/source/ui/unoobj/condformatuno.cxx index 4654efa6caf6..9460f0c0929e 100644 --- a/sc/source/ui/unoobj/condformatuno.cxx +++ b/sc/source/ui/unoobj/condformatuno.cxx @@ -45,13 +45,12 @@ enum CondFormatProperties CondFormat_Range }; -const SfxItemPropertyMapEntry* getCondFormatPropset() +o3tl::span<const SfxItemPropertyMapEntry> getCondFormatPropset() { static const SfxItemPropertyMapEntry aCondFormatPropertyMap_Impl[] = { {u"ID", ID, cppu::UnoType<sal_Int32>::get(), 0, 0}, {u"Range", CondFormat_Range, cppu::UnoType<sheet::XSheetCellRanges>::get(), 0, 0}, - {u"", 0, css::uno::Type(), 0, 0} }; return aCondFormatPropertyMap_Impl; } @@ -64,7 +63,7 @@ enum ConditionEntryProperties Operator }; -const SfxItemPropertyMapEntry* getConditionEntryrPropSet() +o3tl::span<const SfxItemPropertyMapEntry> getConditionEntryrPropSet() { static const SfxItemPropertyMapEntry aConditionEntryPropertyMap_Impl[] = { @@ -72,7 +71,6 @@ const SfxItemPropertyMapEntry* getConditionEntryrPropSet() {u"Formula1", Formula1, cppu::UnoType<OUString>::get(), 0, 0}, {u"Formula2", Formula2, cppu::UnoType<OUString>::get(), 0, 0}, {u"Operator", Operator, cppu::UnoType<decltype(sheet::ConditionFormatOperator::EQUAL)>::get(), 0, 0 }, - {u"", 0, css::uno::Type(), 0, 0} }; return aConditionEntryPropertyMap_Impl; } @@ -118,12 +116,11 @@ enum ColorScaleProperties ColorScaleEntries }; -const SfxItemPropertyMapEntry* getColorScalePropSet() +o3tl::span<const SfxItemPropertyMapEntry> getColorScalePropSet() { static const SfxItemPropertyMapEntry aColorScalePropertyMap_Impl[] = { {u"ColorScaleEntries", ColorScaleEntries, cppu::UnoType<uno::Sequence< sheet::XColorScaleEntry >>::get(), 0, 0 }, - {u"", 0, css::uno::Type(), 0, 0} }; return aColorScalePropertyMap_Impl; } @@ -158,7 +155,7 @@ enum DataBarProperties MaximumLength }; -const SfxItemPropertyMapEntry* getDataBarPropSet() +o3tl::span<const SfxItemPropertyMapEntry> getDataBarPropSet() { static const SfxItemPropertyMapEntry aDataBarPropertyMap_Impl[] = { @@ -172,7 +169,6 @@ const SfxItemPropertyMapEntry* getDataBarPropSet() {u"DataBarEntries", DataBarEntries, cppu::UnoType<uno::Sequence< sheet::XDataBarEntry >>::get(), 0, 0 }, {u"MinimumLength", MinimumLength, cppu::UnoType<double>::get(), 0, 0 }, {u"MaximumLength", MaximumLength, cppu::UnoType<double>::get(), 0, 0 }, - {u"", 0, css::uno::Type(), 0, 0} }; return aDataBarPropertyMap_Impl; } @@ -215,7 +211,7 @@ enum IconSetProperties IconSetEntries }; -const SfxItemPropertyMapEntry* getIconSetPropSet() +o3tl::span<const SfxItemPropertyMapEntry> getIconSetPropSet() { static const SfxItemPropertyMapEntry aIconSetPropertyMap_Impl[] = { @@ -223,7 +219,6 @@ const SfxItemPropertyMapEntry* getIconSetPropSet() {u"Reverse", Reverse, cppu::UnoType<bool>::get(), 0, 0 }, {u"ShowValue", ShowValue, cppu::UnoType<bool>::get(), 0, 0 }, {u"IconSetEntries", IconSetEntries, cppu::UnoType<uno::Sequence< sheet::XIconSetEntry >>::get(), 0, 0 }, - {u"", 0, css::uno::Type(), 0, 0} }; return aIconSetPropertyMap_Impl; } @@ -278,13 +273,12 @@ enum DateProperties DateType }; -const SfxItemPropertyMapEntry* getCondDatePropSet() +o3tl::span<const SfxItemPropertyMapEntry> getCondDatePropSet() { static const SfxItemPropertyMapEntry aCondDatePropertyMap_Impl[] = { {u"StyleName", StyleName, cppu::UnoType<OUString>::get(), 0, 0}, {u"DateType", Icons, cppu::UnoType<decltype(sheet::DateType::TODAY)>::get(), 0, 0 }, - {u"", 0, css::uno::Type(), 0, 0} }; return aCondDatePropertyMap_Impl; } diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx index c71f2f28fd04..a8ea046962c2 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 const SfxItemPropertyMapEntry* lcl_GetConfigPropertyMap() +static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetConfigPropertyMap() { static const SfxItemPropertyMapEntry aConfigPropertyMap_Impl[] = { @@ -91,7 +91,6 @@ static const SfxItemPropertyMapEntry* lcl_GetConfigPropertyMap() { SC_UNO_EMBED_FONT_SCRIPT_COMPLEX, 0, cppu::UnoType<bool>::get(), 0, 0}, { SC_UNO_IMAGE_PREFERRED_DPI, 0, cppu::UnoType<sal_Int32>::get(), 0, 0}, { SC_UNO_SYNTAXSTRINGREF, 0, cppu::UnoType<sal_Int16>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aConfigPropertyMap_Impl; } diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index 64111c1c3437..52492a208e39 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -100,7 +100,7 @@ using ::com::sun::star::table::CellRangeAddress; namespace { -const SfxItemPropertyMapEntry* lcl_GetDataPilotDescriptorBaseMap() +o3tl::span<const SfxItemPropertyMapEntry> lcl_GetDataPilotDescriptorBaseMap() { static const SfxItemPropertyMapEntry aDataPilotDescriptorBaseMap_Impl[] = { @@ -114,12 +114,11 @@ const SfxItemPropertyMapEntry* lcl_GetDataPilotDescriptorBaseMap() { SC_UNO_DP_SERVICEARG, 0, cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get(), 0, 0 }, { SC_UNO_DP_SHOWFILTER, 0, cppu::UnoType<bool>::get(), 0, 0 }, { SC_UNO_DP_SOURCESERVICE, 0, cppu::UnoType<OUString>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; return aDataPilotDescriptorBaseMap_Impl; } -const SfxItemPropertyMapEntry* lcl_GetDataPilotFieldMap() +o3tl::span<const SfxItemPropertyMapEntry> lcl_GetDataPilotFieldMap() { using namespace ::com::sun::star::beans::PropertyAttribute; static const SfxItemPropertyMapEntry aDataPilotFieldMap_Impl[] = @@ -143,19 +142,17 @@ const SfxItemPropertyMapEntry* lcl_GetDataPilotFieldMap() { SC_UNONAME_SUBTOTALS, 0, cppu::UnoType<Sequence<GeneralFunction>>::get(), 0, 0 }, { SC_UNONAME_SUBTOTALS2, 0, cppu::UnoType<Sequence<sal_Int16>>::get(), 0, 0 }, { SC_UNONAME_USESELPAGE, 0, cppu::UnoType<bool>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; return aDataPilotFieldMap_Impl; } -const SfxItemPropertyMapEntry* lcl_GetDataPilotItemMap() +o3tl::span<const SfxItemPropertyMapEntry> lcl_GetDataPilotItemMap() { static const SfxItemPropertyMapEntry aDataPilotItemMap_Impl[] = { { SC_UNONAME_ISHIDDEN, 0, cppu::UnoType<bool>::get(), 0, 0 }, { SC_UNONAME_POS, 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, { SC_UNONAME_SHOWDETAIL, 0, cppu::UnoType<bool>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; return aDataPilotItemMap_Impl; } diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index effa5ed50912..f19386d0a525 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -69,7 +69,7 @@ using namespace css::sheet; // everything without Which-ID, map only for PropertySetInfo -static const SfxItemPropertyMapEntry* lcl_GetSubTotalPropertyMap() +static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetSubTotalPropertyMap() { // some old property names are for 5.2 compatibility @@ -87,12 +87,11 @@ static const SfxItemPropertyMapEntry* lcl_GetSubTotalPropertyMap() { SC_UNONAME_ULIST, 0, cppu::UnoType<bool>::get(), 0, 0}, { SC_UNONAME_UINDEX, 0, cppu::UnoType<sal_Int32>::get(), 0, 0}, { SC_UNONAME_USINDEX, 0, cppu::UnoType<sal_Int32>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aSubTotalPropertyMap_Impl; } -static const SfxItemPropertyMapEntry* lcl_GetFilterPropertyMap() +static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetFilterPropertyMap() { static const SfxItemPropertyMapEntry aFilterPropertyMap_Impl[] = { @@ -105,12 +104,11 @@ static const SfxItemPropertyMapEntry* lcl_GetFilterPropertyMap() { SC_UNONAME_SAVEOUT, 0, cppu::UnoType<bool>::get(), 0, 0}, { SC_UNONAME_SKIPDUP, 0, cppu::UnoType<bool>::get(), 0, 0}, { SC_UNONAME_USEREGEX, 0, cppu::UnoType<bool>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aFilterPropertyMap_Impl; } -static const SfxItemPropertyMapEntry* lcl_GetDBRangePropertyMap() +static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetDBRangePropertyMap() { static const SfxItemPropertyMapEntry aDBRangePropertyMap_Impl[] = { @@ -128,7 +126,6 @@ static const SfxItemPropertyMapEntry* lcl_GetDBRangePropertyMap() { SC_UNONAME_USEFLTCRT,0, cppu::UnoType<bool>::get(), 0, 0}, { SC_UNONAME_TOTALSROW,0, cppu::UnoType<bool>::get(), 0, 0}, { SC_UNONAME_CONTHDR ,0, cppu::UnoType<bool>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aDBRangePropertyMap_Impl; } diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx index e19324cc37e7..af267fb4aecb 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 const SfxItemPropertyMapEntry* lcl_GetDocDefaultsMap() +static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetDocDefaultsMap() { static const SfxItemPropertyMapEntry aDocDefaultsMap_Impl[] = { @@ -63,7 +63,6 @@ static const SfxItemPropertyMapEntry* lcl_GetDocDefaultsMap() { SC_UNO_CTL_CHEIGHT, ATTR_CTL_FONT_HEIGHT, cppu::UnoType<float>::get(), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, { SC_UNO_STANDARDDEC, 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, { SC_UNO_TABSTOPDIS, 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; return aDocDefaultsMap_Impl; } diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 70207977aae6..ebca0e7148c6 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -138,7 +138,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 const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap() +static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetDocOptPropertyMap() { static const SfxItemPropertyMapEntry aDocOptPropertyMap_Impl[] = { @@ -186,14 +186,13 @@ static const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap() {u"BuildId", 0, ::cppu::UnoType<OUString>::get(), 0, 0}, { SC_UNO_CODENAME, 0, cppu::UnoType<OUString>::get(), 0, 0}, { SC_UNO_INTEROPGRABBAG, 0, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aDocOptPropertyMap_Impl; } //! StandardDecimals as property and from NumberFormatter ???????? -static const SfxItemPropertyMapEntry* lcl_GetColumnsPropertyMap() +static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetColumnsPropertyMap() { static const SfxItemPropertyMapEntry aColumnsPropertyMap_Impl[] = { @@ -202,12 +201,11 @@ static const SfxItemPropertyMapEntry* lcl_GetColumnsPropertyMap() { SC_UNONAME_CELLVIS, 0, cppu::UnoType<bool>::get(), 0, 0 }, { SC_UNONAME_OWIDTH, 0, cppu::UnoType<bool>::get(), 0, 0 }, { SC_UNONAME_CELLWID, 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; return aColumnsPropertyMap_Impl; } -static const SfxItemPropertyMapEntry* lcl_GetRowsPropertyMap() +static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetRowsPropertyMap() { static const SfxItemPropertyMapEntry aRowsPropertyMap_Impl[] = { @@ -220,7 +218,6 @@ static const SfxItemPropertyMapEntry* lcl_GetRowsPropertyMap() { SC_UNONAME_CELLBACK, ATTR_BACKGROUND, ::cppu::UnoType<sal_Int32>::get(), 0, MID_BACK_COLOR }, { SC_UNONAME_CELLTRAN, ATTR_BACKGROUND, cppu::UnoType<bool>::get(), 0, MID_GRAPHIC_TRANSPARENT }, // not sorted, not used with SfxItemPropertyMapEntry::GetByName - { u"", 0, css::uno::Type(), 0, 0 } }; return aRowsPropertyMap_Impl; } diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index d79526279d5f..63c3863ab04c 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -59,7 +59,6 @@ const SfxItemPropertySet* getDateTimePropertySet() { SC_UNONAME_ISFIXED, 0, cppu::UnoType<bool>::get(), 0, 0 }, { SC_UNONAME_ISDATE, 0, cppu::UnoType<bool>::get(), 0, 0 }, { SC_UNONAME_NUMFMT, 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; static SfxItemPropertySet aMap(aMapContent); return &aMap; @@ -67,11 +66,7 @@ const SfxItemPropertySet* getDateTimePropertySet() const SfxItemPropertySet* getEmptyPropertySet() { - static const SfxItemPropertyMapEntry aMapContent[] = - { - { u"", 0, css::uno::Type(), 0, 0 } - }; - static SfxItemPropertySet aMap(aMapContent); + static SfxItemPropertySet aMap({}); return &aMap; } @@ -85,7 +80,6 @@ const SfxItemPropertySet* lcl_GetURLPropertySet() { SC_UNONAME_TARGET, 0, cppu::UnoType<OUString>::get(), 0, 0}, { SC_UNONAME_TEXTWRAP, 0, cppu::UnoType<text::WrapTextMode>::get(), beans::PropertyAttribute::READONLY, 0 }, { SC_UNONAME_URL, 0, cppu::UnoType<OUString>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; static SfxItemPropertySet aURLPropertySet_Impl( aURLPropertyMap_Impl ); return &aURLPropertySet_Impl; @@ -98,7 +92,6 @@ const SfxItemPropertySet* lcl_GetHeaderFieldPropertySet() { SC_UNONAME_ANCTYPE, 0, cppu::UnoType<text::TextContentAnchorType>::get(), beans::PropertyAttribute::READONLY, 0 }, { SC_UNONAME_ANCTYPES, 0, cppu::UnoType<uno::Sequence<text::TextContentAnchorType>>::get(), beans::PropertyAttribute::READONLY, 0 }, { SC_UNONAME_TEXTWRAP, 0, cppu::UnoType<text::WrapTextMode>::get(), beans::PropertyAttribute::READONLY, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; static SfxItemPropertySet aHeaderFieldPropertySet_Impl( aHeaderFieldPropertyMap_Impl ); return &aHeaderFieldPropertySet_Impl; @@ -112,7 +105,6 @@ const SfxItemPropertySet* lcl_GetFileFieldPropertySet() { SC_UNONAME_ANCTYPES, 0, cppu::UnoType<uno::Sequence<text::TextContentAnchorType>>::get(), beans::PropertyAttribute::READONLY, 0 }, { SC_UNONAME_FILEFORM, 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, { SC_UNONAME_TEXTWRAP, 0, cppu::UnoType<text::WrapTextMode>::get(), beans::PropertyAttribute::READONLY, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; static SfxItemPropertySet aFileFieldPropertySet_Impl( aFileFieldPropertyMap_Impl ); return &aFileFieldPropertySet_Impl; diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index 64ff2841922c..d09cb4e44634 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -43,7 +43,7 @@ using namespace ::formula; // map only for PropertySetInfo -static const SfxItemPropertyMapEntry* lcl_GetValidatePropertyMap() +static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetValidatePropertyMap() { static const SfxItemPropertyMapEntry aValidatePropertyMap_Impl[] = { @@ -57,7 +57,6 @@ static const SfxItemPropertyMapEntry* lcl_GetValidatePropertyMap() { SC_UNONAME_SHOWINP, 0, cppu::UnoType<bool>::get(), 0, 0}, { SC_UNONAME_SHOWLIST, 0, cppu::UnoType<sal_Int16>::get(), 0, 0}, { SC_UNONAME_TYPE, 0, cppu::UnoType<sheet::ValidationType>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aValidatePropertyMap_Impl; } diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index cbd043a65598..9db4989d046d 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -52,7 +52,7 @@ using ::com::sun::star::uno::RuntimeException; using ::std::vector; // used for sheet- and area link: -static const SfxItemPropertyMapEntry* lcl_GetSheetLinkMap() +static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetSheetLinkMap() { static const SfxItemPropertyMapEntry aSheetLinkMap_Impl[] = { @@ -61,7 +61,6 @@ static const SfxItemPropertyMapEntry* lcl_GetSheetLinkMap() { SC_UNONAME_LINKURL, 0, cppu::UnoType<OUString>::get(), 0, 0 }, { SC_UNONAME_REFDELAY, 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, { SC_UNONAME_REFPERIOD, 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; return aSheetLinkMap_Impl; } diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index 1a1184c002be..842a4e56de90 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -47,7 +47,7 @@ using ::com::sun::star::uno::Any; #include <scui_def.hxx> -static const SfxItemPropertyMapEntry* lcl_GetNamedRangeMap() +static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetNamedRangeMap() { static const SfxItemPropertyMapEntry aNamedRangeMap_Impl[] = { @@ -55,17 +55,15 @@ static const SfxItemPropertyMapEntry* lcl_GetNamedRangeMap() { SC_UNO_LINKDISPNAME, 0, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0 }, { SC_UNONAME_TOKENINDEX, 0, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::READONLY, 0 }, { SC_UNONAME_ISSHAREDFMLA, 0, cppu::UnoType<bool>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; return aNamedRangeMap_Impl; } -static const SfxItemPropertyMapEntry* lcl_GetNamedRangesMap() +static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetNamedRangesMap() { static const SfxItemPropertyMapEntry aNamedRangesMap_Impl[] = { { SC_UNO_MODIFY_BROADCAST, 0, cppu::UnoType<bool>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; return aNamedRangesMap_Impl; } diff --git a/sc/source/ui/unoobj/notesuno.cxx b/sc/source/ui/unoobj/notesuno.cxx index f745de7dd0b1..0018e3e569a9 100644 --- a/sc/source/ui/unoobj/notesuno.cxx +++ b/sc/source/ui/unoobj/notesuno.cxx @@ -45,7 +45,6 @@ static const SvxItemPropertySet* lcl_GetAnnotationPropertySet() SVX_UNOEDIT_FONT_PROPERTIES, SVX_UNOEDIT_PARA_PROPERTIES, SVX_UNOEDIT_NUMBERING_PROPERTY, // for completeness of service ParagraphProperties - { u"", 0, css::uno::Type(), 0, 0 } }; static SvxItemPropertySet aAnnotationPropertySet_Impl( aAnnotationPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); return &aAnnotationPropertySet_Impl; diff --git a/sc/source/ui/unoobj/optuno.cxx b/sc/source/ui/unoobj/optuno.cxx index d652082d3c77..c9ccc8878065 100644 --- a/sc/source/ui/unoobj/optuno.cxx +++ b/sc/source/ui/unoobj/optuno.cxx @@ -29,7 +29,7 @@ using namespace com::sun::star; -const SfxItemPropertyMapEntry* ScDocOptionsHelper::GetPropertyMap() +o3tl::span<const SfxItemPropertyMapEntry> ScDocOptionsHelper::GetPropertyMap() { static const SfxItemPropertyMapEntry aMap[] = { @@ -46,7 +46,6 @@ const SfxItemPropertyMapEntry* ScDocOptionsHelper::GetPropertyMap() { SC_UNO_STANDARDDEC, PROP_UNO_STANDARDDEC , cppu::UnoType<sal_Int16>::get(), 0, 0}, { SC_UNO_REGEXENABLED, PROP_UNO_REGEXENABLED, cppu::UnoType<bool>::get(), 0, 0}, { SC_UNO_WILDCARDSENABLED, PROP_UNO_WILDCARDSENABLED, cppu::UnoType<bool>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aMap; } diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index e8914d859b16..f73571176892 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -47,7 +47,7 @@ using namespace ::com::sun::star; -static const SfxItemPropertyMapEntry* lcl_GetShapeMap() +static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetShapeMap() { static const SfxItemPropertyMapEntry aShapeMap_Impl[] = { @@ -59,7 +59,6 @@ static const SfxItemPropertyMapEntry* lcl_GetShapeMap() { SC_UNONAME_MOVEPROTECT, 0, cppu::UnoType<sal_Bool>::get(), 0, 0 }, { SC_UNONAME_HYPERLINK, 0, cppu::UnoType<OUString>::get(), 0, 0 }, { SC_UNONAME_URL, 0, cppu::UnoType<OUString>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; return aShapeMap_Impl; } diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx index 6d765a5d4d9f..d5d78d75d6d9 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 const SfxItemPropertyMapEntry* lcl_GetSearchPropertyMap() +static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetSearchPropertyMap() { static const SfxItemPropertyMapEntry aSearchPropertyMap_Impl[] = { @@ -49,7 +49,6 @@ static const SfxItemPropertyMapEntry* lcl_GetSearchPropertyMap() { SC_UNO_SRCHSTYLES, 0, cppu::UnoType<bool>::get(), 0, 0}, { SC_UNO_SRCHTYPE, 0, cppu::UnoType<sal_Int16>::get(), 0, 0}, // enum TableSearch is gone { SC_UNO_SRCHWORDS, 0, cppu::UnoType<bool>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aSearchPropertyMap_Impl; } diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index f97129a079a5..3731a0ca60c8 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -168,7 +168,6 @@ static const SfxItemPropertySet* lcl_GetCellStyleSet() {u"" SC_UNONAME_WRITING, ATTR_WRITINGDIR, cppu::UnoType<sal_Int16>::get(), 0, 0 }, {u"" SC_UNONAME_HIDDEN, ATTR_HIDDEN, cppu::UnoType<sal_Bool>::get(), 0, 0 }, {u"" SC_UNONAME_HYPERLINK, ATTR_HYPERLINK, cppu::UnoType<OUString>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; static SfxItemPropertySet aCellStyleSet_Impl( aCellStyleMap_Impl ); return &aCellStyleSet_Impl; @@ -296,7 +295,6 @@ static const SfxItemPropertySet * lcl_GetPageStyleSet() {u"" SC_UNO_PAGE_WIDTH, ATTR_PAGE_SIZE, ::cppu::UnoType<sal_Int32>::get(), 0, MID_SIZE_WIDTH | CONVERT_TWIPS }, {u"" SC_UNONAME_WRITING, ATTR_WRITINGDIR, cppu::UnoType<sal_Int16>::get(), 0, 0 }, {u"" SC_UNONAME_HIDDEN, ATTR_HIDDEN, cppu::UnoType<sal_Bool>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; static SfxItemPropertySet aPageStyleSet_Impl( aPageStyleMap_Impl ); return &aPageStyleSet_Impl; @@ -337,7 +335,6 @@ static const SfxItemPropertyMap* lcl_GetHeaderStyleMap() {u"" SC_UNO_PAGE_HDRTOPBOR, ATTR_BORDER, ::cppu::UnoType<table::BorderLine>::get(), 0, TOP_BORDER | CONVERT_TWIPS }, {u"" SC_UNO_PAGE_HDRTOPBDIS, ATTR_BORDER, ::cppu::UnoType<sal_Int32>::get(), 0, TOP_BORDER_DISTANCE | CONVERT_TWIPS }, {u"" OLD_UNO_PAGE_HDRBACKTRAN,ATTR_BACKGROUND, cppu::UnoType<bool>::get(), 0, MID_GRAPHIC_TRANSPARENT }, - { u"", 0, css::uno::Type(), 0, 0 } }; static SfxItemPropertyMap aHeaderStyleMap( aHeaderStyleMap_Impl ); return &aHeaderStyleMap; @@ -378,7 +375,6 @@ static const SfxItemPropertyMap* lcl_GetFooterStyleMap() {u"" SC_UNO_PAGE_FTRTOPBOR, ATTR_BORDER, ::cppu::UnoType<table::BorderLine>::get(), 0, TOP_BORDER | CONVERT_TWIPS }, {u"" SC_UNO_PAGE_FTRTOPBDIS, ATTR_BORDER, ::cppu::UnoType<sal_Int32>::get(), 0, TOP_BORDER_DISTANCE | CONVERT_TWIPS }, {u"" OLD_UNO_PAGE_FTRBACKTRAN,ATTR_BACKGROUND, cppu::UnoType<bool>::get(), 0, MID_GRAPHIC_TRANSPARENT }, - { u"", 0, css::uno::Type(), 0, 0 } }; static SfxItemPropertyMap aFooterStyleMap( aFooterStyleMap_Impl ); return &aFooterStyleMap; diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx index 8af19b58e4d2..74dd0584434f 100644 --- a/sc/source/ui/unoobj/targuno.cxx +++ b/sc/source/ui/unoobj/targuno.cxx @@ -48,13 +48,12 @@ const TranslateId aTypeResIds[SC_LINKTARGETTYPE_COUNT] = SCSTR_CONTENT_DBAREA // SC_LINKTARGETTYPE_DBAREA }; -static const SfxItemPropertyMapEntry* lcl_GetLinkTargetMap() +static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetLinkTargetMap() { static const SfxItemPropertyMapEntry aLinkTargetMap_Impl[] = { { SC_UNO_LINKDISPBIT, 0, cppu::UnoType<awt::XBitmap>::get(), beans::PropertyAttribute::READONLY, 0 }, { SC_UNO_LINKDISPNAME, 0, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; return aLinkTargetMap_Impl; } diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx index a0afb447c464..e0098476c04f 100644 --- a/sc/source/ui/unoobj/textuno.cxx +++ b/sc/source/ui/unoobj/textuno.cxx @@ -58,24 +58,20 @@ static const SvxItemPropertySet * lcl_GetHdFtPropertySet() SVX_UNOEDIT_FONT_PROPERTIES, SVX_UNOEDIT_PARA_PROPERTIES, SVX_UNOEDIT_NUMBERING_PROPERTY, // for completeness of service ParagraphProperties - { u"", 0, css::uno::Type(), 0, 0 } }; // modify PropertyMap to include CONVERT_TWIPS flag for font height // (headers/footers are in twips) - SfxItemPropertyMapEntry* pEntry = aHdFtPropertyMap_Impl; - while (!pEntry->aName.isEmpty()) + for (auto & rEntry : aHdFtPropertyMap_Impl) { - if ( ( pEntry->nWID == EE_CHAR_FONTHEIGHT || - pEntry->nWID == EE_CHAR_FONTHEIGHT_CJK || - pEntry->nWID == EE_CHAR_FONTHEIGHT_CTL ) && - pEntry->nMemberId == MID_FONTHEIGHT ) + if ( ( rEntry.nWID == EE_CHAR_FONTHEIGHT || + rEntry.nWID == EE_CHAR_FONTHEIGHT_CJK || + rEntry.nWID == EE_CHAR_FONTHEIGHT_CTL ) && + rEntry.nMemberId == MID_FONTHEIGHT ) { - pEntry->nMemberId |= CONVERT_TWIPS; + rEntry.nMemberId |= CONVERT_TWIPS; } - - ++pEntry; } return SvxItemPropertySet(aHdFtPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool()); diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx index 40cb3a613bc3..32570f3914db 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 const SfxItemPropertyMapEntry* lcl_GetFormulaParserMap() +static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetFormulaParserMap() { static const SfxItemPropertyMapEntry aFormulaParserMap_Impl[] = { @@ -55,7 +55,6 @@ static const SfxItemPropertyMapEntry* lcl_GetFormulaParserMap() { SC_UNO_IGNORELEADING, 0, cppu::UnoType<bool>::get(), 0, 0 }, { SC_UNO_FORMULACONVENTION, 0, cppu::UnoType<decltype(sheet::AddressConvention::UNSPECIFIED)>::get(), 0, 0 }, { SC_UNO_OPCODEMAP, 0, cppu::UnoType<uno::Sequence< sheet::FormulaOpCodeMapEntry >>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; return aFormulaParserMap_Impl; } diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index d50a833cfbf8..5a7a8a391427 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -77,7 +77,7 @@ using namespace com::sun::star; // no Which-ID here, Map only for PropertySetInfo -static const SfxItemPropertyMapEntry* lcl_GetViewOptPropertyMap() +static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetViewOptPropertyMap() { static const SfxItemPropertyMapEntry aViewOptPropertyMap_Impl[] = { @@ -110,7 +110,6 @@ static const SfxItemPropertyMapEntry* lcl_GetViewOptPropertyMap() { SC_UNO_ZOOMVALUE, 0, cppu::UnoType<sal_Int16>::get(), 0, 0}, { SC_UNO_VISAREASCREEN,0, cppu::UnoType<awt::Rectangle>::get(), 0, 0}, { SC_UNO_FORMULABARHEIGHT,0,cppu::UnoType<sal_Int16>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aViewOptPropertyMap_Impl; } diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index 047a78fa21ae..f001fa793786 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -30,6 +30,7 @@ #include <sfx2/module.hxx> #include <sal/types.h> #include <vcl/virdev.hxx> +#include <o3tl/span.hxx> #include <map> #include <memory> #include <string_view> @@ -56,7 +57,17 @@ enum class SdOptionStreamMode Store = 1 }; -typedef std::map< SfxItemPropertyMapEntry const * , css::uno::Reference<css::beans::XPropertySetInfo> > SdExtPropertySetInfoCache; +struct SdExtPropertySetInfoCacheCompare +{ + bool operator()(const o3tl::span<SfxItemPropertyMapEntry const>& lhs, const o3tl::span<SfxItemPropertyMapEntry const>& rhs) const + { + return lhs.data() < rhs.data(); + } +}; +typedef std::map< + o3tl::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/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 619614e7a2a6..5a0e8416991a 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -106,7 +106,6 @@ static SvxItemPropertySet& GetStylePropertySet() { u"BottomBorder", SDRATTR_TABLE_BORDER, ::cppu::UnoType<BorderLine>::get(), 0, BOTTOM_BORDER }, { u"LeftBorder", SDRATTR_TABLE_BORDER, ::cppu::UnoType<BorderLine>::get(), 0, LEFT_BORDER }, { u"RightBorder", SDRATTR_TABLE_BORDER, ::cppu::UnoType<BorderLine>::get(), 0, RIGHT_BORDER }, - { u"", 0, css::uno::Type(), 0, 0 } }; static SvxItemPropertySet aPropSet( aFullPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx index 2499588f888e..8c342f1fda63 100644 --- a/sd/source/core/text/textapi.cxx +++ b/sd/source/core/text/textapi.cxx @@ -126,7 +126,6 @@ static const SvxItemPropertySet* ImplGetSdTextPortionPropertyMap() {u"TextPortionType", WID_PORTIONTYPE, ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0 }, {u"TextUserDefinedAttributes", EE_CHAR_XMLATTRIBS, cppu::UnoType<XNameContainer>::get(), 0, 0}, {u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<XNameContainer>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; static SvxItemPropertySet aSdTextPortionPropertyMap( aSdTextPortionPropertyEntries, SdrObject::GetGlobalDrawObjectItemPool() ); diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index fa14c4de6527..bade6d05ec44 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -104,7 +104,7 @@ namespace { }; } -static const SfxItemPropertyMapEntry* ImplGetPresentationPropertyMap() +static o3tl::span<const SfxItemPropertyMapEntry> ImplGetPresentationPropertyMap() { // NOTE: First member must be sorted static const SfxItemPropertyMapEntry aPresentationPropertyMap_Impl[] = @@ -124,7 +124,6 @@ static const SfxItemPropertyMapEntry* ImplGetPresentationPropertyMap() { u"Pause", ATTR_PRESENT_PAUSE_TIMEOUT, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, { u"StartWithNavigator", ATTR_PRESENT_NAVIGATOR, cppu::UnoType<bool>::get(), 0, 0 }, { u"UsePen", ATTR_PRESENT_PEN, cppu::UnoType<bool>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; return aPresentationPropertyMap_Impl; diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index c6bc3cdf398b..4fc571aa9e79 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -69,7 +69,6 @@ static const SvxItemPropertySet* ImplGetSdLayerPropertySet() { u"" UNO_NAME_LAYER_NAME, WID_LAYER_NAME, ::cppu::UnoType<OUString>::get(), 0, 0 }, { u"Title", WID_LAYER_TITLE, ::cppu::UnoType<OUString>::get(), 0, 0 }, { u"Description", WID_LAYER_DESC, ::cppu::UnoType<OUString>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; static SvxItemPropertySet aSDLayerPropertySet_Impl( aSdLayerPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); return &aSDLayerPropertySet_Impl; diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 8f296d598dec..3482600afd4c 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -224,7 +224,6 @@ static const SvxItemPropertySet* ImplGetDrawModelPropertySet() { u"Fonts", WID_MODEL_FONTS, cppu::UnoType<uno::Sequence<uno::Any>>::get(), beans::PropertyAttribute::READONLY, 0}, { sUNO_Prop_InteropGrabBag, WID_MODEL_INTEROPGRABBAG, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get(), 0, 0}, { sUNO_Prop_Theme, WID_MODEL_THEME, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; static SvxItemPropertySet aDrawModelPropertySet_Impl( aDrawModelPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); return &aDrawModelPropertySet_Impl; diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index bdd8104bef7c..85a3045d5000 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -128,11 +128,9 @@ using ::com::sun::star::drawing::XShape; { u"IsAnimation", WID_ISANIMATION, cppu::UnoType<bool>::get(), 0, 0},\ { u"NavigationOrder", WID_NAVORDER, cppu::UnoType<sal_Int32>::get(), 0, 0},\ { u"PlaceholderText", WID_PLACEHOLDERTEXT, cppu::UnoType<OUString>::get(), 0, 0},\ - { u"", 0, css::uno::Type(), 0, 0 } - static const SfxItemPropertyMapEntry* lcl_GetImpress_SdXShapePropertyGraphicMap_Impl() + static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetImpress_SdXShapePropertyGraphicMap_Impl() { - static const SfxItemPropertyMapEntry aImpress_SdXShapePropertyGraphicMap_Impl[] = { { u"ImageMap", WID_IMAGEMAP, cppu::UnoType<container::XIndexContainer>::get(), 0, 0 }, @@ -141,9 +139,8 @@ using ::com::sun::star::drawing::XShape; return aImpress_SdXShapePropertyGraphicMap_Impl; } - static const SfxItemPropertyMapEntry* lcl_GetImpress_SdXShapePropertySimpleMap_Impl() + static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetImpress_SdXShapePropertySimpleMap_Impl() { - static const SfxItemPropertyMapEntry aImpress_SdXShapePropertySimpleMap_Impl[] = { IMPRESS_MAP_ENTRIES @@ -156,9 +153,8 @@ using ::com::sun::star::drawing::XShape; { u"" UNO_NAME_OBJ_CLICKACTION, WID_CLICKACTION, cppu::UnoType<presentation::ClickAction>::get(),0, 0},\ { u"" UNO_NAME_OBJ_STYLE, WID_STYLE, cppu::UnoType<style::XStyle>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0},\ { u"NavigationOrder", WID_NAVORDER, cppu::UnoType<sal_Int32>::get(), 0, 0},\ - { u"", 0, css::uno::Type(), 0, 0 } - static const SfxItemPropertyMapEntry* lcl_GetDraw_SdXShapePropertySimpleMap_Impl() + static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetDraw_SdXShapePropertySimpleMap_Impl() { static const SfxItemPropertyMapEntry aDraw_SdXShapePropertyMap_Impl[] = { @@ -166,7 +162,7 @@ using ::com::sun::star::drawing::XShape; }; return aDraw_SdXShapePropertyMap_Impl; } - static const SfxItemPropertyMapEntry* lcl_GetDraw_SdXShapePropertyGraphicMap_Impl() + static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetDraw_SdXShapePropertyGraphicMap_Impl() { static const SfxItemPropertyMapEntry aDraw_SdXShapePropertyGraphicMap_Impl[] = { @@ -175,9 +171,9 @@ using ::com::sun::star::drawing::XShape; }; return aDraw_SdXShapePropertyGraphicMap_Impl; } - static const SfxItemPropertyMapEntry* lcl_ImplGetShapePropertyMap( bool bImpress, bool bGraphicObj ) + static o3tl::span<const SfxItemPropertyMapEntry> lcl_ImplGetShapePropertyMap( bool bImpress, bool bGraphicObj ) { - const SfxItemPropertyMapEntry* pRet = nullptr; + o3tl::span<const SfxItemPropertyMapEntry> pRet; if( bImpress ) { if( bGraphicObj ) @@ -226,13 +222,9 @@ using ::com::sun::star::drawing::XShape; } return pRet; } - static const SfxItemPropertyMapEntry* lcl_GetEmpty_SdXShapePropertyMap_Impl() + static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetEmpty_SdXShapePropertyMap_Impl() { - static const SfxItemPropertyMapEntry aEmpty_SdXShapePropertyMap_Impl[] = - { - { u"", 0, css::uno::Type(), 0, 0 } - }; - return aEmpty_SdXShapePropertyMap_Impl; + return {}; } static const SvxItemPropertySet* lcl_GetEmpty_SdXShapePropertySet_Impl() @@ -386,7 +378,7 @@ uno::Any SAL_CALL SdXShape::getPropertyDefault( const OUString& aPropertyName ) //XPropertySet css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL SdXShape::getPropertySetInfo() { - SfxItemPropertyMapEntry const * nObjId = mpShape->getPropertyMapEntries(); + o3tl::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 3f01cbed1a02..407f5491a15a 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; - const SfxItemPropertyMapEntry* mpMap; + o3tl::span<const SfxItemPropertyMapEntry> mpMap; SdXImpressDocument* mpModel; /// @throws css::lang::IllegalArgumentException diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 8a9549c51723..deedd27d4b12 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -153,7 +153,6 @@ static const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, Page { u"" UNO_NAME_PAGE_TRANSITION_DURATION, WID_TRANSITION_DURATION, ::cppu::UnoType<double>::get(), 0, 0}, { u"LoopSound", WID_LOOP_SOUND, cppu::UnoType<bool>::get(), 0, 0}, { u"NavigationOrder", WID_NAVORDER, cppu::UnoType<css::container::XIndexAccess>::get(),0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; #define DRAW_PAGE_NOTES_PROPERTIES \ @@ -179,8 +178,7 @@ static const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, Page { u"IsDateTimeFixed", WID_PAGE_DATETIMEFIXED, cppu::UnoType<bool>::get(), 0, 0}, \ { u"DateTimeText", WID_PAGE_DATETIMETEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, \ { u"DateTimeFormat", WID_PAGE_DATETIMEFORMAT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ - { u"NavigationOrder", WID_NAVORDER, cppu::UnoType<css::container::XIndexAccess>::get(),0, 0}, \ - { u"", 0, css::uno::Type(), 0, 0 } + { u"NavigationOrder", WID_NAVORDER, cppu::UnoType<css::container::XIndexAccess>::get(),0, 0} static const SfxItemPropertyMapEntry aDrawPageNotesHandoutPropertyMap_Impl[] = { @@ -210,8 +208,7 @@ static const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, Page { sUNO_Prop_UserDefinedAttributes,WID_PAGE_USERATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, \ { sUNO_Prop_BookmarkURL, WID_PAGE_BOOKMARK, ::cppu::UnoType<OUString>::get(), 0, 0}, \ { u"IsBackgroundDark", WID_PAGE_ISDARK, cppu::UnoType<bool>::get(), beans::PropertyAttribute::READONLY, 0}, \ - { u"NavigationOrder", WID_NAVORDER, cppu::UnoType<css::container::XIndexAccess>::get(),0, 0}, \ - { u"", 0, css::uno::Type(), 0, 0 } + { u"NavigationOrder", WID_NAVORDER, cppu::UnoType<css::container::XIndexAccess>::get(),0, 0} static const SfxItemPropertyMapEntry aGraphicPagePropertyMap_Impl[] = { @@ -282,8 +279,7 @@ static const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKin { u"BackgroundFullSize", WID_PAGE_BACKFULL, cppu::UnoType<bool>::get(), 0, 0}, { sUNO_Prop_UserDefinedAttributes,WID_PAGE_USERATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { u"IsBackgroundDark", WID_PAGE_ISDARK, cppu::UnoType<bool>::get(), beans::PropertyAttribute::READONLY, 0}, - { u"Theme", WID_PAGE_THEME, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } + { u"Theme", WID_PAGE_THEME, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get(), 0, 0} }; static const SfxItemPropertyMapEntry aHandoutMasterPagePropertyMap_Impl[] = @@ -307,8 +303,7 @@ static const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKin { u"IsDateTimeVisible", WID_PAGE_DATETIMEVISIBLE, cppu::UnoType<bool>::get(), 0, 0}, { u"IsDateTimeFixed", WID_PAGE_DATETIMEFIXED, cppu::UnoType<bool>::get(), 0, 0}, { u"DateTimeText", WID_PAGE_DATETIMETEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, - { u"DateTimeFormat", WID_PAGE_DATETIMEFORMAT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } + { u"DateTimeFormat", WID_PAGE_DATETIMEFORMAT, ::cppu::UnoType<sal_Int32>::get(), 0, 0} }; const SvxItemPropertySet* pRet = nullptr; diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx index 508b1f8662fc..02ba92ff0178 100644 --- a/sd/source/ui/unoidl/unopback.cxx +++ b/sd/source/ui/unoidl/unopback.cxx @@ -39,7 +39,6 @@ const SvxItemPropertySet* ImplGetPageBackgroundPropertySet() static const SfxItemPropertyMapEntry aPageBackgroundPropertyMap_Impl[] = { FILL_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; static SvxItemPropertySet aPageBackgroundPropertySet_Impl( aPageBackgroundPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx index f1005819d1a3..3ac777b3522a 100644 --- a/sd/source/ui/unoidl/unosrch.cxx +++ b/sd/source/ui/unoidl/unosrch.cxx @@ -40,14 +40,13 @@ using namespace ::com::sun::star; #define WID_SEARCH_CASE 1 #define WID_SEARCH_WORDS 2 -static const SfxItemPropertyMapEntry* ImplGetSearchPropertyMap() +static o3tl::span<const SfxItemPropertyMapEntry> ImplGetSearchPropertyMap() { static const SfxItemPropertyMapEntry aSearchPropertyMap_Impl[] = { { u"" UNO_NAME_SEARCH_BACKWARDS, WID_SEARCH_BACKWARDS, cppu::UnoType<bool>::get(), 0, 0 }, { u"" UNO_NAME_SEARCH_CASE, WID_SEARCH_CASE, cppu::UnoType<bool>::get(), 0, 0 }, { u"" UNO_NAME_SEARCH_WORDS, WID_SEARCH_WORDS, cppu::UnoType<bool>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; return aSearchPropertyMap_Impl; diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx index 1b1e39594287..40cb1da98d6e 100644 --- a/sfx2/source/doc/iframe.cxx +++ b/sfx2/source/doc/iframe.cxx @@ -128,7 +128,7 @@ IFrameWindow_Impl::IFrameWindow_Impl( vcl::Window *pParent, bool bHasBorder ) #define WID_FRAME_MARGIN_WIDTH 7 #define WID_FRAME_MARGIN_HEIGHT 8 -const SfxItemPropertyMapEntry* lcl_GetIFramePropertyMap_Impl() +o3tl::span<const SfxItemPropertyMapEntry> lcl_GetIFramePropertyMap_Impl() { static const SfxItemPropertyMapEntry aIFramePropertyMap_Impl[] = { @@ -140,7 +140,6 @@ const SfxItemPropertyMapEntry* lcl_GetIFramePropertyMap_Impl() { u"FrameMarginWidth", WID_FRAME_MARGIN_WIDTH, cppu::UnoType<sal_Int32>::get(), PROPERTY_UNBOUND, 0 }, { u"FrameName", WID_FRAME_NAME, cppu::UnoType<OUString>::get(), PROPERTY_UNBOUND, 0 }, { u"FrameURL", WID_FRAME_URL, cppu::UnoType<OUString>::get(), PROPERTY_UNBOUND, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; return aIFramePropertyMap_Impl; } diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx index 56e3254b78f9..e8dd3ccd28ef 100644 --- a/svl/source/items/itemprop.cxx +++ b/svl/source/items/itemprop.cxx @@ -35,13 +35,13 @@ using namespace com::sun::star::beans; using namespace com::sun::star::lang; using namespace com::sun::star::uno; -SfxItemPropertyMap::SfxItemPropertyMap( const SfxItemPropertyMapEntry* pEntries ) +SfxItemPropertyMap::SfxItemPropertyMap( o3tl::span<const SfxItemPropertyMapEntry> pEntries ) { - m_aMap.reserve(128); - while( !pEntries->aName.isEmpty() ) + m_aMap.reserve(pEntries.size()); + for (const auto & pEntry : pEntries) { - m_aMap.insert( pEntries ); - ++pEntries; + assert(!pEntry.aName.isEmpty() && "empty name? might be something left an empty entry at the end of this array"); + m_aMap.insert( &pEntry ); } } @@ -246,7 +246,7 @@ SfxItemPropertySetInfo::SfxItemPropertySetInfo(const SfxItemPropertyMap &rMap ) { } -SfxItemPropertySetInfo::SfxItemPropertySetInfo(const SfxItemPropertyMapEntry *pEntries ) +SfxItemPropertySetInfo::SfxItemPropertySetInfo(o3tl::span<const SfxItemPropertyMapEntry> pEntries ) : m_aOwnMap( pEntries ) { } @@ -270,14 +270,14 @@ sal_Bool SAL_CALL SfxItemPropertySetInfo::hasPropertyByName( const OUString& rNa return m_aOwnMap.hasPropertyByName( rName ); } -SfxExtItemPropertySetInfo::SfxExtItemPropertySetInfo( const SfxItemPropertyMapEntry *pEntries, +SfxExtItemPropertySetInfo::SfxExtItemPropertySetInfo( o3tl::span<const SfxItemPropertyMapEntry> pEntries, const Sequence<Property>& rPropSeq ) { - maMap.reserve(16); - while( !pEntries->aName.isEmpty() ) + maMap.reserve(pEntries.size() + rPropSeq.getLength()); + for (const auto & rEntry : pEntries ) { - maMap.insert( *pEntries ); - ++pEntries; + assert(!rEntry.aName.isEmpty() && "empty name? might be something left an empty entry at the end of this array"); + maMap.insert( rEntry ); } for( const auto & rProp : rPropSeq ) { diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx index 8743ab578b4b..c95ec9f4f0e5 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 const SfxItemPropertyMapEntry* lcl_GetNumberFormatPropertyMap() +static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetNumberFormatPropertyMap() { static const SfxItemPropertyMapEntry aNumberFormatPropertyMap_Impl[] = { @@ -79,12 +79,11 @@ static const SfxItemPropertyMapEntry* lcl_GetNumberFormatPropertyMap() {PROPERTYNAME_THOUS, 0, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, {PROPERTYNAME_USERDEF, 0, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, {PROPERTYNAME_CURRABB, 0, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aNumberFormatPropertyMap_Impl; } -static const SfxItemPropertyMapEntry* lcl_GetNumberSettingsPropertyMap() +static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetNumberSettingsPropertyMap() { static const SfxItemPropertyMapEntry aNumberSettingsPropertyMap_Impl[] = { @@ -92,7 +91,6 @@ static const SfxItemPropertyMapEntry* lcl_GetNumberSettingsPropertyMap() {PROPERTYNAME_NULLDATE, 0, cppu::UnoType<util::Date>::get(), beans::PropertyAttribute::BOUND, 0}, {PROPERTYNAME_STDDEC, 0, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND, 0}, {PROPERTYNAME_TWODIGIT, 0, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aNumberSettingsPropertyMap_Impl; } diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 2d609cf4a5d0..74bb6301d50c 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -99,7 +99,6 @@ static const SvxItemPropertySet* ImplGetSvxCellPropertySet() SVX_UNOEDIT_OUTLINER_PROPERTIES, SVX_UNOEDIT_CHAR_PROPERTIES, SVX_UNOEDIT_PARA_PROPERTIES, - { u"", 0, css::uno::Type(), 0, 0 } }; static SvxItemPropertySet aSvxCellPropertySet( aSvxCellPropertyMap, SdrObject::GetGlobalDrawObjectItemPool() ); diff --git a/svx/source/unodraw/SvxXTextColumns.cxx b/svx/source/unodraw/SvxXTextColumns.cxx index 00971bc7bc87..838ca5d4cabb 100644 --- a/svx/source/unodraw/SvxXTextColumns.cxx +++ b/svx/source/unodraw/SvxXTextColumns.cxx @@ -67,7 +67,6 @@ SfxItemPropertyMapEntry const saTextColumns_Impl[] = { cppu::UnoType<css::style::VerticalAlignment>::get(), 0, 0 }, { u"SeparatorLineIsOn", WID_TXTCOL_LINE_IS_ON, cppu::UnoType<bool>::get(), 0, 0 }, { u"SeparatorLineStyle", WID_TXTCOL_LINE_STYLE, cppu::UnoType<sal_Int16>::get(), 0, 0 }, - { u"", 0, css::uno::Type(), 0, 0 }, }; class SvxXTextColumns final diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 68bdde6a511a..faebaf224213 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 SfxItemPropertyMapEntry const * ImplGetSvxShapePropertyMap() +static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxShapePropertyMap() { static SfxItemPropertyMapEntry const aShapePropertyMap_Impl[] = { @@ -72,13 +72,12 @@ static SfxItemPropertyMapEntry const * ImplGetSvxShapePropertyMap() FONTWORK_PROPERTIES { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aShapePropertyMap_Impl; } -static SfxItemPropertyMapEntry const * ImplGetSvxTextShapePropertyMap() +static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxTextShapePropertyMap() { static SfxItemPropertyMapEntry const aTextShapePropertyMap_Impl[] = { @@ -97,13 +96,12 @@ static SfxItemPropertyMapEntry const * ImplGetSvxTextShapePropertyMap() FONTWORK_PROPERTIES { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aTextShapePropertyMap_Impl; } -static SfxItemPropertyMapEntry const * ImplGetSvxConnectorPropertyMap() +static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxConnectorPropertyMap() { static SfxItemPropertyMapEntry const aConnectorPropertyMap_Impl[] = { @@ -123,13 +121,12 @@ static SfxItemPropertyMapEntry const * ImplGetSvxConnectorPropertyMap() FONTWORK_PROPERTIES { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aConnectorPropertyMap_Impl; } -static SfxItemPropertyMapEntry const * ImplGetSvxDimensioningPropertyMap() +static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxDimensioningPropertyMap() { static SfxItemPropertyMapEntry const aDimensioningPropertyMap_Impl[] = { @@ -149,13 +146,12 @@ static SfxItemPropertyMapEntry const * ImplGetSvxDimensioningPropertyMap() FONTWORK_PROPERTIES { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aDimensioningPropertyMap_Impl; } -static SfxItemPropertyMapEntry const * ImplGetSvxCirclePropertyMap() +static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxCirclePropertyMap() { static SfxItemPropertyMapEntry const aCirclePropertyMap_Impl[] = { @@ -175,13 +171,12 @@ static SfxItemPropertyMapEntry const * ImplGetSvxCirclePropertyMap() FONTWORK_PROPERTIES { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aCirclePropertyMap_Impl; } -static SfxItemPropertyMapEntry const * ImplGetSvxPolyPolygonPropertyMap() +static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxPolyPolygonPropertyMap() { static SfxItemPropertyMapEntry const aPolyPolygonPropertyMap_Impl[] = { @@ -203,13 +198,12 @@ static SfxItemPropertyMapEntry const * ImplGetSvxPolyPolygonPropertyMap() FONTWORK_PROPERTIES { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aPolyPolygonPropertyMap_Impl; } -static SfxItemPropertyMapEntry const * ImplGetSvxGraphicObjectPropertyMap() +static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxGraphicObjectPropertyMap() { static SfxItemPropertyMapEntry const aGraphicObjectPropertyMap_Impl[] = { @@ -236,13 +230,12 @@ static SfxItemPropertyMapEntry const * ImplGetSvxGraphicObjectPropertyMap() { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { u"GraphicStream", OWN_ATTR_GRAPHIC_STREAM, cppu::UnoType<css::io::XInputStream>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aGraphicObjectPropertyMap_Impl; } -static SfxItemPropertyMapEntry const * ImplGetSvx3DSceneObjectPropertyMap() +static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvx3DSceneObjectPropertyMap() { static SfxItemPropertyMapEntry const a3DSceneObjectPropertyMap_Impl[] = { @@ -254,13 +247,12 @@ static SfxItemPropertyMapEntry const * ImplGetSvx3DSceneObjectPropertyMap() MISC_OBJ_PROPERTIES LINKTARGET_PROPERTIES SHADOW_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; return a3DSceneObjectPropertyMap_Impl; } -static SfxItemPropertyMapEntry const * ImplGetSvx3DCubeObjectPropertyMap() +static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvx3DCubeObjectPropertyMap() { static SfxItemPropertyMapEntry const a3DCubeObjectPropertyMap_Impl[] = { @@ -275,13 +267,12 @@ static SfxItemPropertyMapEntry const * ImplGetSvx3DCubeObjectPropertyMap() SHADOW_PROPERTIES { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return a3DCubeObjectPropertyMap_Impl; } -static SfxItemPropertyMapEntry const * ImplGetSvx3DSphereObjectPropertyMap() +static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvx3DSphereObjectPropertyMap() { static SfxItemPropertyMapEntry const a3DSphereObjectPropertyMap_Impl[] = { @@ -296,12 +287,11 @@ static SfxItemPropertyMapEntry const * ImplGetSvx3DSphereObjectPropertyMap() SHADOW_PROPERTIES { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return a3DSphereObjectPropertyMap_Impl; } -static SfxItemPropertyMapEntry const * ImplGetSvx3DLatheObjectPropertyMap() +static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvx3DLatheObjectPropertyMap() { static SfxItemPropertyMapEntry const a3DLatheObjectPropertyMap_Impl[] = { @@ -321,13 +311,12 @@ static SfxItemPropertyMapEntry const * ImplGetSvx3DLatheObjectPropertyMap() SHADOW_PROPERTIES { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return a3DLatheObjectPropertyMap_Impl; } -static SfxItemPropertyMapEntry const * ImplGetSvx3DExtrudeObjectPropertyMap() +static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvx3DExtrudeObjectPropertyMap() { static SfxItemPropertyMapEntry const a3DExtrudeObjectPropertyMap_Impl[] = { @@ -347,13 +336,12 @@ static SfxItemPropertyMapEntry const * ImplGetSvx3DExtrudeObjectPropertyMap() SHADOW_PROPERTIES { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return a3DExtrudeObjectPropertyMap_Impl; } -static SfxItemPropertyMapEntry const * ImplGetSvx3DPolygonObjectPropertyMap() +static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvx3DPolygonObjectPropertyMap() { static SfxItemPropertyMapEntry const a3DPolygonObjectPropertyMap_Impl[] = { @@ -368,13 +356,12 @@ static SfxItemPropertyMapEntry const * ImplGetSvx3DPolygonObjectPropertyMap() SHADOW_PROPERTIES { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return a3DPolygonObjectPropertyMap_Impl; } -static SfxItemPropertyMapEntry const * ImplGetSvxAllPropertyMap() +static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxAllPropertyMap() { static SfxItemPropertyMapEntry const aAllPropertyMap_Impl[] = { @@ -412,26 +399,24 @@ static SfxItemPropertyMapEntry const * ImplGetSvxAllPropertyMap() SPECIAL_3DPOLYGONOBJECT_PROPERTIES { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aAllPropertyMap_Impl; } -static SfxItemPropertyMapEntry const * ImplGetSvxGroupPropertyMap() +static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxGroupPropertyMap() { static SfxItemPropertyMapEntry const aGroupPropertyMap_Impl[] = { SHAPE_DESCRIPTOR_PROPERTIES MISC_OBJ_PROPERTIES LINKTARGET_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; return aGroupPropertyMap_Impl; } -static SfxItemPropertyMapEntry const * ImplGetSvxOle2PropertyMap() +static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxOle2PropertyMap() { static SfxItemPropertyMapEntry const aOle2PropertyMap_Impl[] = { @@ -460,13 +445,12 @@ static SfxItemPropertyMapEntry const * ImplGetSvxOle2PropertyMap() { UNO_NAME_OLE2_PERSISTNAME, OWN_ATTR_PERSISTNAME , cppu::UnoType<OUString>::get(), 0, 0 }, { u"LinkURL", OWN_ATTR_OLE_LINKURL , cppu::UnoType<OUString>::get(), 0, 0 }, { UNO_NAME_GRAPHOBJ_GRAPHIC, OWN_ATTR_VALUE_GRAPHIC , cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aOle2PropertyMap_Impl; } -static SfxItemPropertyMapEntry const * ImplGetSvxPluginPropertyMap() +static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxPluginPropertyMap() { static SfxItemPropertyMapEntry const aPluginPropertyMap_Impl[] = { @@ -491,13 +475,12 @@ static SfxItemPropertyMapEntry const * ImplGetSvxPluginPropertyMap() // #i68101# { UNO_NAME_MISC_OBJ_TITLE, OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0}, { UNO_NAME_MISC_OBJ_DESCRIPTION, OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType<OUString>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aPluginPropertyMap_Impl; } -static SfxItemPropertyMapEntry const * ImplGetSvxFramePropertyMap() +static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxFramePropertyMap() { //TODO/LATER: new properties for ScrollingMode and DefaultBorder static SfxItemPropertyMapEntry const aFramePropertyMap_Impl[] = @@ -526,13 +509,12 @@ static SfxItemPropertyMapEntry const * ImplGetSvxFramePropertyMap() // #i68101# { UNO_NAME_MISC_OBJ_TITLE, OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0}, { UNO_NAME_MISC_OBJ_DESCRIPTION, OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType<OUString>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aFramePropertyMap_Impl; } -static SfxItemPropertyMapEntry const * ImplGetSvxAppletPropertyMap() +static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxAppletPropertyMap() { static SfxItemPropertyMapEntry const aAppletPropertyMap_Impl[] = { @@ -560,13 +542,12 @@ static SfxItemPropertyMapEntry const * ImplGetSvxAppletPropertyMap() // #i68101# { UNO_NAME_MISC_OBJ_TITLE, OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0}, { UNO_NAME_MISC_OBJ_DESCRIPTION, OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType<OUString>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aAppletPropertyMap_Impl; } -static SfxItemPropertyMapEntry const * ImplGetSvxControlShapePropertyMap() +static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxControlShapePropertyMap() { static SfxItemPropertyMapEntry const aControlPropertyMap_Impl[] = { @@ -620,13 +601,12 @@ static SfxItemPropertyMapEntry const * ImplGetSvxControlShapePropertyMap() { UNO_NAME_MISC_OBJ_PRINTABLE, SDRATTR_OBJPRINTABLE , cppu::UnoType<bool>::get(), 0, 0}, { u"Visible", SDRATTR_OBJVISIBLE , cppu::UnoType<bool>::get(), 0, 0}, { UNO_NAME_MISC_OBJ_INTEROPGRABBAG, OWN_ATTR_INTEROPGRABBAG, cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aControlPropertyMap_Impl; } -static SfxItemPropertyMapEntry const * ImplGetSvxPageShapePropertyMap() +static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxPageShapePropertyMap() { static SfxItemPropertyMapEntry const aPageShapePropertyMap_Impl[] = { @@ -643,13 +623,12 @@ static SfxItemPropertyMapEntry const * ImplGetSvxPageShapePropertyMap() // #i68101# { UNO_NAME_MISC_OBJ_TITLE, OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0}, { UNO_NAME_MISC_OBJ_DESCRIPTION, OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType<OUString>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aPageShapePropertyMap_Impl; } -static SfxItemPropertyMapEntry const * ImplGetSvxCaptionPropertyMap() +static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxCaptionPropertyMap() { static SfxItemPropertyMapEntry const aCaptionPropertyMap_Impl[] = { @@ -677,13 +656,12 @@ static SfxItemPropertyMapEntry const * ImplGetSvxCaptionPropertyMap() FONTWORK_PROPERTIES { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, {u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aCaptionPropertyMap_Impl; } -static SfxItemPropertyMapEntry const * ImplGetSvxCustomShapePropertyMap() +static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxCustomShapePropertyMap() { static SfxItemPropertyMapEntry const aCustomShapePropertyMap_Impl[] = { @@ -703,12 +681,11 @@ static SfxItemPropertyMapEntry const * ImplGetSvxCustomShapePropertyMap() TEXT_PROPERTIES {u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, {u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aCustomShapePropertyMap_Impl; } -static SfxItemPropertyMapEntry const * ImplGetSvxMediaShapePropertyMap() +static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxMediaShapePropertyMap() { static SfxItemPropertyMapEntry const aMediaShapePropertyMap_Impl[] = { @@ -736,13 +713,12 @@ static SfxItemPropertyMapEntry const * ImplGetSvxMediaShapePropertyMap() { u"MediaMimeType", OWN_ATTR_MEDIA_MIMETYPE, cppu::UnoType<OUString>::get(), 0, 0}, { u"FallbackGraphic", OWN_ATTR_FALLBACK_GRAPHIC, cppu::UnoType<css::graphic::XGraphic>::get(), css::beans::PropertyAttribute::READONLY, 0}, { UNO_NAME_GRAPHOBJ_GRAPHIC, OWN_ATTR_VALUE_GRAPHIC , cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aMediaShapePropertyMap_Impl; } -static SfxItemPropertyMapEntry const * ImplGetSvxTableShapePropertyMap() +static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxTableShapePropertyMap() { static SfxItemPropertyMapEntry const aTableShapePropertyMap_Impl[] = { @@ -769,7 +745,6 @@ static SfxItemPropertyMapEntry const * ImplGetSvxTableShapePropertyMap() { u"UseBandingRowStyle", OWN_ATTR_TABLETEMPLATE_BANDINGROWS, cppu::UnoType<bool>::get(),0, 0}, { u"UseBandingColumnStyle", OWN_ATTR_TABLETEMPLATE_BANDINGCOLUMNS, cppu::UnoType<bool>::get(),0, 0}, { u"ReplacementGraphic", OWN_ATTR_REPLACEMENT_GRAPHIC, cppu::UnoType<css::graphic::XGraphic>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aTableShapePropertyMap_Impl; @@ -891,10 +866,7 @@ SvxUnoPropertyMapProvider& getSvxMapProvider() SvxUnoPropertyMapProvider::SvxUnoPropertyMapProvider() { for(sal_uInt16 i=0;i<SVXMAP_END; i++) - { aSetArr[i] = nullptr; - aMapArr[i] = nullptr; - } } SvxUnoPropertyMapProvider::~SvxUnoPropertyMapProvider() @@ -902,10 +874,10 @@ SvxUnoPropertyMapProvider::~SvxUnoPropertyMapProvider() } -const SfxItemPropertyMapEntry* SvxUnoPropertyMapProvider::GetMap(sal_uInt16 nPropertyId) +o3tl::span<const SfxItemPropertyMapEntry> SvxUnoPropertyMapProvider::GetMap(sal_uInt16 nPropertyId) { assert(nPropertyId < SVXMAP_END); - if(!aMapArr[nPropertyId]) { + if(aMapArr[nPropertyId].empty()) { switch(nPropertyId) { case SVXMAP_SHAPE: aMapArr[SVXMAP_SHAPE]=ImplGetSvxShapePropertyMap(); break; case SVXMAP_CONNECTOR: aMapArr[SVXMAP_CONNECTOR]=ImplGetSvxConnectorPropertyMap(); break; diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 6972819c3876..d00be27a474b 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -1788,7 +1788,7 @@ void SvxCustomShape::createCustomShapeDefaults( const OUString& rValueType ) static_cast<SdrObjCustomShape*>(GetSdrObject())->MergeDefaultAttributes( &rValueType ); } -SvxShapeGroupAnyD::SvxShapeGroupAnyD( SdrObject* pObject, const SfxItemPropertyMapEntry* pEntries, const SvxItemPropertySet* pPropertySet ) +SvxShapeGroupAnyD::SvxShapeGroupAnyD( SdrObject* pObject, o3tl::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 3d80997a115a..aee99b3841d3 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -70,7 +70,7 @@ SvxOle2Shape::SvxOle2Shape(SdrObject* pObject) { } -SvxOle2Shape::SvxOle2Shape(SdrObject* pObject, const SfxItemPropertyMapEntry* pPropertyMap, const SvxItemPropertySet* pPropertySet) +SvxOle2Shape::SvxOle2Shape(SdrObject* pObject, o3tl::span<const SfxItemPropertyMapEntry> pPropertyMap, const SvxItemPropertySet* pPropertySet) : SvxShapeText( pObject, pPropertyMap, pPropertySet ) { } diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index e559fe8b4b9f..56c47ff581cc 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -206,7 +206,7 @@ SvxShape::SvxShape( SdrObject* pObject ) } -SvxShape::SvxShape( SdrObject* pObject, const SfxItemPropertyMapEntry* pEntries, const SvxItemPropertySet* pPropertySet ) +SvxShape::SvxShape( SdrObject* pObject, o3tl::span<const SfxItemPropertyMapEntry> pEntries, const SvxItemPropertySet* pPropertySet ) : maSize(100,100) , mpImpl( new SvxShapeImpl( *this, m_aMutex ) ) , mbIsMultiPropertyCall(false) @@ -3800,7 +3800,7 @@ SvxShapeText::SvxShapeText(SdrObject* pObject) } -SvxShapeText::SvxShapeText(SdrObject* pObject, const SfxItemPropertyMapEntry* pPropertyMap, const SvxItemPropertySet* pPropertySet) +SvxShapeText::SvxShapeText(SdrObject* pObject, o3tl::span<const SfxItemPropertyMapEntry> pPropertyMap, const SvxItemPropertySet* pPropertySet) : SvxShape( pObject, pPropertyMap, pPropertySet ), SvxUnoTextBase( ImplGetSvxUnoOutlinerTextCursorSvxPropertySet() ) { if( pObject ) diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx index b6404abae7af..df4f739127c9 100644 --- a/sw/inc/unodraw.hxx +++ b/sw/inc/unodraw.hxx @@ -143,7 +143,7 @@ class SwXShape : public SwXShapeBaseClass, public SvtListener css::uno::Reference< css::drawing::XShape > mxShape; const SfxItemPropertySet* m_pPropSet; - const SfxItemPropertyMapEntry* m_pPropertyMapEntries; + o3tl::span<const SfxItemPropertyMapEntry> m_pPropertyMapEntries; css::uno::Reference< css::beans::XPropertySetInfo > mxPropertySetInfo; std::unique_ptr<SwShapeDescriptor_Impl> m_pImpl; diff --git a/sw/inc/unomap.hxx b/sw/inc/unomap.hxx index bae3be46d40f..b30603266732 100644 --- a/sw/inc/unomap.hxx +++ b/sw/inc/unomap.hxx @@ -20,6 +20,7 @@ #define INCLUDED_SW_INC_UNOMAP_HXX #include <sal/types.h> +#include <o3tl/span.hxx> class SfxItemPropertySet; struct SfxItemPropertyMapEntry; @@ -315,45 +316,45 @@ struct SfxItemPropertyMapEntry; class SwUnoPropertyMapProvider { - SfxItemPropertyMapEntry const * m_aMapEntriesArr[PROPERTY_MAP_END]; + o3tl::span<SfxItemPropertyMapEntry const> m_aMapEntriesArr[PROPERTY_MAP_END]; SfxItemPropertySet* m_aPropertySetArr[PROPERTY_MAP_END]; public: SwUnoPropertyMapProvider(); - const SfxItemPropertyMapEntry* GetPropertyMapEntries(sal_uInt16 PropertyId); + o3tl::span<const SfxItemPropertyMapEntry> GetPropertyMapEntries(sal_uInt16 PropertyId); const SfxItemPropertySet* GetPropertySet( sal_uInt16 PropertyId ); private: - static const SfxItemPropertyMapEntry* GetTextCursorPropertyMap(); - static const SfxItemPropertyMapEntry* GetAccessibilityTextAttrPropertyMap(); - static const SfxItemPropertyMapEntry* GetParagraphPropertyMap(); - static const SfxItemPropertyMapEntry* GetAutoParaStylePropertyMap(); - static const SfxItemPropertyMapEntry* GetCharStylePropertyMap(); - static const SfxItemPropertyMapEntry* GetAutoCharStylePropertyMap(); - static const SfxItemPropertyMapEntry* GetParaStylePropertyMap(); - static const SfxItemPropertyMapEntry* GetConditionalParaStylePropertyMap(); - static const SfxItemPropertyMapEntry* GetFrameStylePropertyMap(); - static const SfxItemPropertyMapEntry* GetPageStylePropertyMap(); - static const SfxItemPropertyMapEntry* GetTablePropertyMap(); - static const SfxItemPropertyMapEntry* GetRangePropertyMap(); - static const SfxItemPropertyMapEntry* GetSectionPropertyMap(); - static const SfxItemPropertyMapEntry* GetFramePropertyMap(); - static const SfxItemPropertyMapEntry* GetGraphicPropertyMap(); - static const SfxItemPropertyMapEntry* GetEmbeddedPropertyMap(); - static const SfxItemPropertyMapEntry* GetIndexMarkPropertyMap(); - static const SfxItemPropertyMapEntry* GetContentMarkPropertyMap(); - static const SfxItemPropertyMapEntry* GetUserMarkPropertyMap(); - static const SfxItemPropertyMapEntry* GetTextTableCursorPropertyMap(); - static const SfxItemPropertyMapEntry* GetBookmarkPropertyMap(); - static const SfxItemPropertyMapEntry* GetParagraphExtensionsPropertyMap(); - static const SfxItemPropertyMapEntry* GetTextPortionExtensionPropertyMap(); - static const SfxItemPropertyMapEntry* GetFootnotePropertyMap(); - static const SfxItemPropertyMapEntry* GetRedlinePropertyMap(); - static const SfxItemPropertyMapEntry* GetRedlinePortionPropertyMap(); - static SfxItemPropertyMapEntry* GetTextDefaultPropertyMap(); - static const SfxItemPropertyMapEntry* GetLineBreakPropertyMap(); - static const SfxItemPropertyMapEntry* GetContentControlPropertyMap(); + static o3tl::span<const SfxItemPropertyMapEntry> GetTextCursorPropertyMap(); + static o3tl::span<const SfxItemPropertyMapEntry> GetAccessibilityTextAttrPropertyMap(); + static o3tl::span<const SfxItemPropertyMapEntry> GetParagraphPropertyMap(); + static o3tl::span<const SfxItemPropertyMapEntry> GetAutoParaStylePropertyMap(); + static o3tl::span<const SfxItemPropertyMapEntry> GetCharStylePropertyMap(); + static o3tl::span<const SfxItemPropertyMapEntry> GetAutoCharStylePropertyMap(); + static o3tl::span<const SfxItemPropertyMapEntry> GetParaStylePropertyMap(); + static o3tl::span<const SfxItemPropertyMapEntry> GetConditionalParaStylePropertyMap(); + static o3tl::span<const SfxItemPropertyMapEntry> GetFrameStylePropertyMap(); + static o3tl::span<const SfxItemPropertyMapEntry> GetPageStylePropertyMap(); + static o3tl::span<const SfxItemPropertyMapEntry> GetTablePropertyMap(); + static o3tl::span<const SfxItemPropertyMapEntry> GetRangePropertyMap(); + static o3tl::span<const SfxItemPropertyMapEntry> GetSectionPropertyMap(); + static o3tl::span<const SfxItemPropertyMapEntry> GetFramePropertyMap(); + static o3tl::span<const SfxItemPropertyMapEntry> GetGraphicPropertyMap(); + static o3tl::span<const SfxItemPropertyMapEntry> GetEmbeddedPropertyMap(); + static o3tl::span<const SfxItemPropertyMapEntry> GetIndexMarkPropertyMap(); + static o3tl::span<const SfxItemPropertyMapEntry> GetContentMarkPropertyMap(); + static o3tl::span<const SfxItemPropertyMapEntry> GetUserMarkPropertyMap(); + static o3tl::span<const SfxItemPropertyMapEntry> GetTextTableCursorPropertyMap(); + static o3tl::span<const SfxItemPropertyMapEntry> GetBookmarkPropertyMap(); + static o3tl::span<const SfxItemPropertyMapEntry> GetParagraphExtensionsPropertyMap(); + static o3tl::span<const SfxItemPropertyMapEntry> GetTextPortionExtensionPropertyMap(); + static o3tl::span<const SfxItemPropertyMapEntry> GetFootnotePropertyMap(); + static o3tl::span<const SfxItemPropertyMapEntry> GetRedlinePropertyMap(); + static o3tl::span<const SfxItemPropertyMapEntry> GetRedlinePortionPropertyMap(); + static o3tl::span<SfxItemPropertyMapEntry> GetTextDefaultPropertyMap(); + static o3tl::span<const SfxItemPropertyMapEntry> GetLineBreakPropertyMap(); + static o3tl::span<const SfxItemPropertyMapEntry> GetContentControlPropertyMap(); }; extern SwUnoPropertyMapProvider aSwMapProvider; diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 9cbab57ad8d6..a12044e8496e 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -1765,26 +1765,24 @@ void SwAccessibleParagraph::_getSupplementalAttributesImpl( tAccParaPropValMap aSupplementalAttrSeq; { - const SfxItemPropertyMapEntry* pPropMap( + o3tl::span<const SfxItemPropertyMapEntry> pPropMap( aSwMapProvider.GetPropertyMapEntries( PROPERTY_MAP_ACCESSIBILITY_TEXT_ATTRIBUTE ) ); - while ( !pPropMap->aName.isEmpty() ) + for (const auto & rEntry : pPropMap) { - const SfxPoolItem* pItem = aSet.GetItem( pPropMap->nWID ); + const SfxPoolItem* pItem = aSet.GetItem( rEntry.nWID ); if ( pItem ) { uno::Any aVal; - pItem->QueryValue( aVal, pPropMap->nMemberId ); + pItem->QueryValue( aVal, rEntry.nMemberId ); PropertyValue rPropVal; - rPropVal.Name = pPropMap->aName; + rPropVal.Name = rEntry.aName; rPropVal.Value = aVal; rPropVal.Handle = -1; rPropVal.State = beans::PropertyState_DEFAULT_VALUE; aSupplementalAttrSeq[rPropVal.Name] = rPropVal; } - - ++pPropMap; } } diff --git a/sw/source/core/fields/textapi.cxx b/sw/source/core/fields/textapi.cxx index 2efb97ef61ed..eecaf14217f4 100644 --- a/sw/source/core/fields/textapi.cxx +++ b/sw/source/core/fields/textapi.cxx @@ -52,7 +52,6 @@ static const SvxItemPropertySet* ImplGetSvxTextPortionPropertySet() cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, {u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; static SvxItemPropertySet aSvxTextPortionPropertySet( aSvxTextPortionPropertyMap, EditEngine::GetGlobalItemPool() ); return &aSvxTextPortionPropertySet; diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx index e07481448d40..51aa11ea6159 100644 --- a/sw/source/core/unocore/unomap.cxx +++ b/sw/source/core/unocore/unomap.cxx @@ -68,10 +68,10 @@ using namespace ::com::sun::star::beans; { u"" UNO_NAME_IS_FIELD_DISPLAYED, FIELD_PROP_IS_FIELD_DISPLAYED, cppu::UnoType<sal_Int16>::get(), PropertyAttribute::READONLY, 0},\ { u"" UNO_NAME_TITLE, FIELD_PROP_TITLE, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},\ -const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(sal_uInt16 nPropertyId) +o3tl::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetPropertyMapEntries(sal_uInt16 nPropertyId) { OSL_ENSURE(nPropertyId < PROPERTY_MAP_END, "Id ?" ); - if( !m_aMapEntriesArr[ nPropertyId ] ) + if( m_aMapEntriesArr[ nPropertyId ].empty() ) { switch(nPropertyId) { @@ -112,7 +112,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s { u"" UNO_NAME_RUBY_ADJUST, RES_TXTATR_CJK_RUBY, cppu::UnoType<sal_Int16>::get(), PropertyAttribute::MAYBEVOID, MID_RUBY_ADJUST }, { u"" UNO_NAME_RUBY_IS_ABOVE, RES_TXTATR_CJK_RUBY, cppu::UnoType<bool>::get(), PropertyAttribute::MAYBEVOID, MID_RUBY_ABOVE }, { u"" UNO_NAME_RUBY_POSITION, RES_TXTATR_CJK_RUBY, cppu::UnoType<sal_Int16>::get(), PropertyAttribute::MAYBEVOID, MID_RUBY_POSITION }, - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aAutoRubyStyleMap; } @@ -146,7 +145,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s { u"" UNO_NAME_DISPLAY_NAME, FN_UNO_DISPLAY_NAME, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0}, { u"" UNO_NAME_HIDDEN, FN_UNO_HIDDEN, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, { u"" UNO_NAME_STYLE_INTEROP_GRAB_BAG, FN_UNO_STYLE_INTEROP_GRAB_BAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aNumStyleMap; } @@ -186,7 +184,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s { u"" UNO_NAME_CELL_INTEROP_GRAB_BAG, RES_FRMATR_GRABBAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0 }, { u"" UNO_NAME_PARENT_TEXT, FN_UNO_PARENT_TEXT, cppu::UnoType<text::XText>::get(), PropertyAttribute::MAYBEVOID | PropertyAttribute::READONLY, 0 }, REDLINE_NODE_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aCellMap_Impl; } @@ -216,7 +213,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s { u"" UNO_NAME_SEARCH_SIMILARITY_REMOVE, WID_SIMILARITY_REMOVE, cppu::UnoType<sal_Int16>::get() , PROPERTY_NONE, 0}, { u"" UNO_NAME_SEARCH_STYLES, WID_STYLES, cppu::UnoType<bool>::get() , PROPERTY_NONE, 0}, { u"" UNO_NAME_SEARCH_WORDS, WID_WORDS, cppu::UnoType<bool>::get() , PROPERTY_NONE, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aSearchPropertyMap_Impl; } @@ -296,7 +292,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s { u"" UNO_NAME_CHAIN_NEXT_NAME, RES_CHAIN, cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID ,MID_CHAIN_NEXTNAME}, { u"" UNO_NAME_CHAIN_PREV_NAME, RES_CHAIN, cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID ,MID_CHAIN_PREVNAME}, { u"" UNO_NAME_CHAIN_NAME, RES_CHAIN, cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID ,MID_CHAIN_NAME }, - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aShapeMap_Impl; } @@ -349,7 +344,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s { u"" UNO_NAME_IS_RELATIVE_TABSTOPS, WID_IS_RELATIVE_TABSTOPS, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, { u"" UNO_NAME_LOCALE, WID_IDX_LOCALE, cppu::UnoType<css::lang::Locale>::get(), PROPERTY_NONE, 0}, { u"" UNO_NAME_SORT_ALGORITHM, WID_IDX_SORT_ALGORITHM, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aTOXIndexMap_Impl; } @@ -392,7 +386,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s { u"" UNO_NAME_PARA_STYLELEVEL10, WID_PARA_LEV10, cppu::UnoType<OUString>::get() , 0, 0}, { u"" UNO_NAME_IS_RELATIVE_TABSTOPS, WID_IS_RELATIVE_TABSTOPS, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, { u"" UNO_NAME_DOCUMENT_INDEX_MARKS, WID_INDEX_MARKS, cppu::UnoType< cppu::UnoSequenceType<css::text::XDocumentIndexMark> >::get(), PropertyAttribute::READONLY ,0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aTOXContentMap_Impl; } @@ -439,7 +432,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s { u"" UNO_NAME_DOCUMENT_INDEX_MARKS, WID_INDEX_MARKS, cppu::UnoType< cppu::UnoSequenceType<css::text::XDocumentIndexMark> >::get(), PropertyAttribute::READONLY ,0 }, { u"" UNO_NAME_IS_RELATIVE_TABSTOPS, WID_IS_RELATIVE_TABSTOPS, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, { u"" UNO_NAME_USER_INDEX_NAME, WID_USER_IDX_NAME, cppu::UnoType<OUString>::get() , PROPERTY_NONE, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aTOXUserMap_Impl; } @@ -465,7 +457,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s { u"" UNO_NAME_PARA_STYLEHEADING, WID_PARA_HEAD, cppu::UnoType<OUString>::get() , 0, 0}, { u"" UNO_NAME_PARA_STYLELEVEL1, WID_PARA_LEV1, cppu::UnoType<OUString>::get() , 0, 0}, { u"" UNO_NAME_IS_RELATIVE_TABSTOPS, WID_IS_RELATIVE_TABSTOPS, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aTOXTablesMap_Impl; } @@ -494,7 +485,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s { u"" UNO_NAME_PARA_STYLEHEADING, WID_PARA_HEAD, cppu::UnoType<OUString>::get() , 0, 0}, { u"" UNO_NAME_PARA_STYLELEVEL1, WID_PARA_LEV1, cppu::UnoType<OUString>::get() , 0, 0}, { u"" UNO_NAME_IS_RELATIVE_TABSTOPS, WID_IS_RELATIVE_TABSTOPS, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aTOXObjectsMap_Impl; } @@ -521,7 +511,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s { u"" UNO_NAME_PARA_STYLEHEADING, WID_PARA_HEAD, cppu::UnoType<OUString>::get() , 0, 0}, { u"" UNO_NAME_PARA_STYLELEVEL1, WID_PARA_LEV1, cppu::UnoType<OUString>::get() , 0, 0}, { u"" UNO_NAME_IS_RELATIVE_TABSTOPS, WID_IS_RELATIVE_TABSTOPS, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aTOXIllustrationsMap_Impl; } @@ -544,7 +533,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s { u"" UNO_NAME_IS_SPLIT_ALLOWED, RES_ROW_SPLIT, cppu::UnoType<bool>::get() , PropertyAttribute::MAYBEVOID, 0}, { u"" UNO_NAME_HAS_TEXT_CHANGES_ONLY, RES_PRINT, cppu::UnoType<bool>::get() , PropertyAttribute::MAYBEVOID, 0}, { u"" UNO_NAME_ROW_INTEROP_GRAB_BAG, RES_FRMATR_GRABBAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aTableRowPropertyMap_Impl; @@ -566,7 +554,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s { // FIXME: is this supposed to actually exist as UNO property, or is it supposed to be in the "parameters" of the field? { u"Checked", 0, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aFieldmarkMap_Impl; } @@ -594,7 +581,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s { u"" UNO_NAME_LEVEL_FORMAT, WID_LEVEL_FORMAT , cppu::UnoType<css::container::XIndexReplace>::get() , PROPERTY_NONE,0}, { u"" UNO_NAME_LOCALE, WID_IDX_LOCALE, cppu::UnoType<css::lang::Locale>::get(), PROPERTY_NONE, 0}, { u"" UNO_NAME_SORT_ALGORITHM, WID_IDX_SORT_ALGORITHM, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aBibliographyMap_Impl; } @@ -644,7 +630,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s { u"" UNO_NAME_BUILDID, WID_DOC_BUILDID, cppu::UnoType<OUString>::get(), 0, 0}, { u"" UNO_NAME_DOC_INTEROP_GRAB_BAG, WID_DOC_INTEROP_GRAB_BAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0 }, { u"" UNO_NAME_DEFAULT_PAGE_MODE, WID_DOC_DEFAULT_PAGE_MODE, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aDocMap_Impl; } @@ -655,7 +640,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s { { u"" UNO_LINK_DISPLAY_BITMAP, 0, cppu::UnoType<css::awt::XBitmap>::get(), PropertyAttribute::READONLY, 0xbf}, { u"" UNO_LINK_DISPLAY_NAME, 0, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0xbf}, - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aLinkTargetMap_Impl; } @@ -666,7 +650,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s { { u"" UNO_NAME_FILE_PATH, WID_GROUP_PATH, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0}, { u"" UNO_NAME_TITLE, WID_GROUP_TITLE, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aAutoTextGroupMap_Impl; } @@ -688,14 +671,13 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s break; case PROPERTY_MAP_TEXT_DEFAULT : { - SfxItemPropertyMapEntry* aTextDefaultMap_Impl = GetTextDefaultPropertyMap(); + o3tl::span<SfxItemPropertyMapEntry> aTextDefaultMap_Impl = GetTextDefaultPropertyMap(); m_aMapEntriesArr[nPropertyId] = aTextDefaultMap_Impl; - for( SfxItemPropertyMapEntry * pMap = aTextDefaultMap_Impl; - !pMap->aName.isEmpty(); ++pMap ) + for( auto & rEntry : aTextDefaultMap_Impl ) { // UNO_NAME_PAGE_DESC_NAME should keep its MAYBEVOID flag - if (RES_PAGEDESC != pMap->nWID || MID_PAGEDESC_PAGEDESCNAME != pMap->nMemberId) - pMap->nFlags &= ~PropertyAttribute::MAYBEVOID; + if (RES_PAGEDESC != rEntry.nWID || MID_PAGEDESC_PAGEDESCNAME != rEntry.nMemberId) + rEntry.nFlags &= ~PropertyAttribute::MAYBEVOID; } } break; @@ -715,7 +697,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_NUMBER_FORMAT, FIELD_PROP_FORMAT, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_IS_FIXED_LANGUAGE, FIELD_PROP_BOOL4, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aDateTimeFieldPropMap; } @@ -729,7 +710,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_NUMBER_FORMAT, FIELD_PROP_FORMAT, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_IS_FIXED_LANGUAGE, FIELD_PROP_BOOL4, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aUserFieldPropMap; @@ -755,7 +735,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_VARIABLE_NAME, FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0}, {u"" UNO_NAME_IS_FIXED_LANGUAGE, FIELD_PROP_BOOL4, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aSetExpFieldPropMap; } @@ -773,7 +752,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_VARIABLE_SUBTYPE, FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_IS_FIXED_LANGUAGE, FIELD_PROP_BOOL4, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aGetExpFieldPropMap; } @@ -786,7 +764,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_FILE_FORMAT, FIELD_PROP_FORMAT, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_IS_FIXED, FIELD_PROP_BOOL2, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aFileNameFieldPropMap; } @@ -800,7 +777,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_SUB_TYPE, FIELD_PROP_SUBTYPE, cppu::UnoType<css::text::PageNumberType>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_USERTEXT, FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aPageNumFieldPropMap; } @@ -814,7 +790,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_IS_FIXED, FIELD_PROP_BOOL2, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_FULL_NAME,FIELD_PROP_BOOL1, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aAuthorFieldPropMap; } @@ -826,7 +801,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_CHAPTER_FORMAT,FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_LEVEL,FIELD_PROP_BYTE1, cppu::UnoType<sal_Int8>::get(), PROPERTY_NONE, 0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aChapterFieldPropMap; } @@ -842,7 +816,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_SOURCE_NAME, FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_REFERENCE_FIELD_LANGUAGE, FIELD_PROP_PAR4, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aGetRefFieldPropMap; } @@ -857,7 +830,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_TRUE_CONTENT , FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR4, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aConditionedTextFieldPropMap; } @@ -871,7 +843,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_IS_HIDDEN , FIELD_PROP_BOOL1, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR4, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aHiddenTextFieldPropMap; } @@ -889,7 +860,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_DATE, FIELD_PROP_DATE, cppu::UnoType<css::util::Date>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_TEXT_RANGE, FIELD_PROP_TEXT, cppu::UnoType<css::uno::XInterface>::get(), PropertyAttribute::READONLY, 0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aAnnotationFieldPropMap; } @@ -904,7 +874,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_TOOLTIP, FIELD_PROP_PAR4, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, {UNO_NAME_MISC_OBJ_INTEROPGRABBAG, FIELD_PROP_GRABBAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aInputFieldPropMap; } @@ -918,7 +887,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_MACRO_LIBRARY,FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),PROPERTY_NONE, 0}, {u"" UNO_NAME_SCRIPT_URL,FIELD_PROP_PAR4, cppu::UnoType<OUString>::get(),PROPERTY_NONE, 0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aMacroFieldPropMap; } @@ -928,7 +896,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s static SfxItemPropertyMapEntry const aDDEFieldPropMap [] = { COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aDDEFieldPropMap; } @@ -943,7 +910,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_HELP, FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_TOOLTIP, FIELD_PROP_PAR4, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aDropDownMap; } @@ -955,7 +921,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_CONDITION,FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_IS_HIDDEN , FIELD_PROP_BOOL1, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aHiddenParaFieldPropMap; } @@ -968,7 +933,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_INFO_FORMAT, FIELD_PROP_USHORT2, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_INFO_TYPE, FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aDocInfoFieldPropMap; } @@ -979,7 +943,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s { {u"" UNO_NAME_FILE_FORMAT, FIELD_PROP_FORMAT, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aTmplNameFieldPropMap; } @@ -993,7 +956,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_IS_FIXED, FIELD_PROP_BOOL1, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_USER_DATA_TYPE, FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId]= aUsrExtFieldPropMap; } @@ -1005,7 +967,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_OFFSET, FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_ON, FIELD_PROP_BOOL1, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aRefPgSetFieldPropMap; } @@ -1017,7 +978,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_NUMBERING_TYPE, FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aRefPgGetFieldPropMap; } @@ -1030,7 +990,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_PLACEHOLDER, FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_PLACEHOLDER_TYPE, FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aJumpEdtFieldPropMap; } @@ -1043,7 +1002,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_SCRIPT_TYPE, FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_URL_CONTENT, FIELD_PROP_BOOL1, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aScriptFieldPropMap; } @@ -1062,7 +1020,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_DATA_BASE_URL , FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_DATA_COMMAND_TYPE, FIELD_PROP_SHORT1, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, 0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aDBNextSetFieldPropMap; } @@ -1082,7 +1039,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_DATA_COMMAND_TYPE, FIELD_PROP_SHORT1, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_SET_NUMBER, FIELD_PROP_FORMAT, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, 0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aDBNumSetFieldPropMap; } @@ -1103,7 +1059,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_SET_NUMBER, FIELD_PROP_FORMAT, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_IS_VISIBLE, FIELD_PROP_BOOL2, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aDBSetNumFieldPropMap; } @@ -1119,7 +1074,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_NUMBER_FORMAT, FIELD_PROP_FORMAT, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_IS_VISIBLE, FIELD_PROP_BOOL2, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aDBFieldPropMap; } @@ -1138,7 +1092,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_DATA_COMMAND_TYPE, FIELD_PROP_SHORT1, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_IS_VISIBLE, FIELD_PROP_BOOL2, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aDBNameFieldPropMap; } @@ -1150,7 +1103,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_NUMBERING_TYPE, FIELD_PROP_USHORT2, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0}, // {UNO_NAME_STATISTIC_TYPE_ID,FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aDocstatFieldPropMap; } @@ -1163,7 +1115,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_IS_FIXED, FIELD_PROP_BOOL1, cppu::UnoType<bool>::get() , PROPERTY_NONE,0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aDocInfoAuthorPropMap; } @@ -1178,7 +1129,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_NUMBER_FORMAT,FIELD_PROP_FORMAT, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_IS_FIXED, FIELD_PROP_BOOL1, cppu::UnoType<bool>::get() , PROPERTY_NONE, 0}, {u"" UNO_NAME_IS_FIXED_LANGUAGE, FIELD_PROP_BOOL4, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aDocInfoDateTimePropMap; } @@ -1193,7 +1143,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_IS_FIXED, FIELD_PROP_BOOL1, cppu::UnoType<bool>::get() , PROPERTY_NONE, 0}, {u"" UNO_NAME_IS_FIXED_LANGUAGE, FIELD_PROP_BOOL4, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aDocInfoEditTimePropMap; } @@ -1206,7 +1155,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_IS_FIXED, FIELD_PROP_BOOL1, cppu::UnoType<bool>::get() , PROPERTY_NONE,0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aDocInfoStringContentPropMap; } @@ -1221,7 +1169,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_NUMBER_FORMAT, FIELD_PROP_FORMAT, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_IS_FIXED_LANGUAGE, FIELD_PROP_BOOL4, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aDocInfoCustomPropMap; } @@ -1234,7 +1181,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_REVISION, FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_IS_FIXED, FIELD_PROP_BOOL1, cppu::UnoType<bool>::get() , PROPERTY_NONE,0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aDocInfoRevisionPropMap; } @@ -1245,7 +1191,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s { {u"" UNO_NAME_CONTENT, FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aCombinedCharactersPropMap; } @@ -1259,7 +1204,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_IS_SHOW_FORMULA, FIELD_PROP_BOOL1, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_NUMBER_FORMAT, FIELD_PROP_FORMAT, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, 0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aTableFormulaPropMap; } @@ -1269,7 +1213,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s static SfxItemPropertyMapEntry const aEmptyPropMap [] = { COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aEmptyPropMap; } @@ -1284,7 +1227,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_VALUE, FIELD_PROP_DOUBLE, cppu::UnoType<double>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_CONTENT, FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_INSTANCE_NAME, FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aUserFieldTypePropMap; } @@ -1301,7 +1243,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_NAME, FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_INSTANCE_NAME, FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0}, {u"" UNO_NAME_CONTENT, FIELD_PROP_PAR5, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aDDEFieldTypePropMap; } @@ -1316,7 +1257,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_NUMBERING_SEPARATOR, FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_SUB_TYPE, FIELD_PROP_SUBTYPE, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_INSTANCE_NAME, FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aSetExpFieldTypePropMap; } @@ -1337,7 +1277,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_DATA_BASE_URL , FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_DATA_COMMAND_TYPE, FIELD_PROP_SHORT1, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_DEPENDENT_TEXT_FIELDS, FIELD_PROP_PROP_SEQ, cppu::UnoType< cppu::UnoSequenceType<css::text::XDependentTextField> >::get(), PropertyAttribute::READONLY, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aDBFieldTypePropMap; } @@ -1349,7 +1288,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_DEPENDENT_TEXT_FIELDS, 0, cppu::UnoType< cppu::UnoSequenceType<css::text::XDependentTextField> >::get(), PropertyAttribute::READONLY, 0}, {u"" UNO_NAME_NAME, 0, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_INSTANCE_NAME, 0, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aStandardFieldMasterMap; } @@ -1360,7 +1298,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s { {u"" UNO_NAME_FIELDS , FIELD_PROP_PROP_SEQ, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(),PROPERTY_NONE, 0}, COMMON_FLDTYP_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aBibliographyFieldMap; } @@ -1377,7 +1314,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_SORT_ALGORITHM, FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_SORT_KEYS , FIELD_PROP_PROP_SEQ, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValues> >::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_INSTANCE_NAME, FIELD_PROP_PAR4, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aBibliographyFieldMasterMap; } @@ -1387,7 +1323,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s static SfxItemPropertyMapEntry const aTextMap[] = { REDLINE_NODE_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aTextMap; } @@ -1427,7 +1362,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s { u"" UNO_NAME_BLIND_COPIES_TO, WID_BLIND_COPIES_TO, cppu::UnoType< cppu::UnoSequenceType<OUString> >::get(), PROPERTY_NONE, 0}, { u"" UNO_NAME_IN_SERVER_PASSWORD, WID_IN_SERVER_PASSWORD, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, { u"" UNO_NAME_OUT_SERVER_PASSWORD, WID_OUT_SERVER_PASSWORD, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aMailMergeMap; } @@ -1440,7 +1374,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {u"" UNO_NAME_LINE_COUNT, WID_LINE_COUNT, cppu::UnoType<sal_Int32>::get(), PropertyAttribute::READONLY, 0}, {u"" UNO_NAME_IS_CONSTANT_SPELLCHECK, WID_IS_CONSTANT_SPELLCHECK, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, {u"" UNO_NAME_IS_HIDE_SPELL_MARKS, WID_IS_HIDE_SPELL_MARKS, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, // deprecated #i91949 - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = pTextViewMap; } @@ -1450,7 +1383,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s static SfxItemPropertyMapEntry const aChart2DataSequenceMap[] = { {u"" UNO_NAME_ROLE, 0, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aChart2DataSequenceMap; } @@ -1463,7 +1395,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, 0 }, { u"" UNO_NAME_IS_FIXED_LANGUAGE, 0, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aMetaFieldMap; } @@ -1477,7 +1408,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s { u"" UNO_NAME_TABLE_LAST_ROW_END_COLUMN, 0, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0 }, { u"" UNO_NAME_TABLE_LAST_ROW_START_COLUMN, 0, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0 }, { u"" UNO_NAME_DISPLAY_NAME, 0, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aTableStyleMap; } @@ -1549,7 +1479,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s { u"" UNO_NAME_CHAR_FONT_FAMILY_COMPLEX, RES_CHRATR_CTL_FONT, cppu::UnoType<sal_Int16>::get(), PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY }, { u"" UNO_NAME_CHAR_FONT_CHAR_SET_COMPLEX, RES_CHRATR_CTL_FONT, cppu::UnoType<sal_Int16>::get(), PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET }, { u"" UNO_NAME_CHAR_FONT_PITCH_COMPLEX, RES_CHRATR_CTL_FONT, cppu::UnoType<sal_Int16>::get(), PropertyAttribute::MAYBEVOID, MID_FONT_PITCH }, - { u"", 0, css::uno::Type(), 0, 0 } }; m_aMapEntriesArr[nPropertyId] = aCellStyleMap; } diff --git a/sw/source/core/unocore/unomap1.cxx b/sw/source/core/unocore/unomap1.cxx index b7d86d6628b3..4e99cc4223f0 100644 --- a/sw/source/core/unocore/unomap1.cxx +++ b/sw/source/core/unocore/unomap1.cxx @@ -90,34 +90,31 @@ SwUnoPropertyMapProvider::SwUnoPropertyMapProvider() { for( sal_uInt16 i = 0; i < PROPERTY_MAP_END; i++ ) { - m_aMapEntriesArr[i] = nullptr; m_aPropertySetArr[i] = nullptr; } } -const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetTextCursorPropertyMap() +o3tl::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetTextCursorPropertyMap() { static SfxItemPropertyMapEntry const aCharAndParaMap_Impl[] = { COMPLETE_TEXT_CURSOR_MAP - { u"", 0, css::uno::Type(), 0, 0 } }; return aCharAndParaMap_Impl; } -const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetAccessibilityTextAttrPropertyMap() +o3tl::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetAccessibilityTextAttrPropertyMap() { static SfxItemPropertyMapEntry const aAccessibilityTextAttrMap_Impl[] = { COMMON_ACCESSIBILITY_TEXT_ATTRIBUTE - { u"", 0, css::uno::Type(), 0, 0 } }; return aAccessibilityTextAttrMap_Impl; } -const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetParagraphPropertyMap() +o3tl::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetParagraphPropertyMap() { static SfxItemPropertyMapEntry const aParagraphMap_Impl[] = { @@ -132,13 +129,12 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetParagraphPropertyMa // This entry is for adding that properties to style import/export // Added for paragraph backgrounds, this is for paragraph itself FILL_PROPERTIES_SW - { u"", 0, css::uno::Type(), 0, 0 } }; return aParagraphMap_Impl; } -const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetAutoParaStylePropertyMap() +o3tl::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetAutoParaStylePropertyMap() { static SfxItemPropertyMapEntry const aAutoParaStyleMap [] = { @@ -168,13 +164,12 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetAutoParaStyleProper // This entry is for adding that properties to style import/export // Added for paragraph backgrounds, this is for Paragraph AutoStyles FILL_PROPERTIES_SW - { u"", 0, css::uno::Type(), 0, 0 } }; return aAutoParaStyleMap; } -const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetCharStylePropertyMap() +o3tl::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetCharStylePropertyMap() { static SfxItemPropertyMapEntry const aCharStyleMap [] = { @@ -230,13 +225,12 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetCharStylePropertyMa { u"" UNO_NAME_CHAR_BOTTOM_BORDER_DISTANCE, RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS }, { u"" UNO_NAME_CHAR_SHADOW_FORMAT, RES_CHRATR_SHADOW, cppu::UnoType<css::table::ShadowFormat>::get(), PROPERTY_NONE, CONVERT_TWIPS}, { u"" UNO_NAME_LINK_STYLE, FN_UNO_LINK_STYLE, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aCharStyleMap; } -const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetAutoCharStylePropertyMap() +o3tl::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetAutoCharStylePropertyMap() { // same as PROPERTY_MAP_TEXTPORTION_EXTENSIONS static SfxItemPropertyMapEntry const aAutoCharStyleMap [] = @@ -292,13 +286,12 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetAutoCharStyleProper { u"" UNO_NAME_CHAR_TOP_BORDER_DISTANCE, RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, TOP_BORDER_DISTANCE |CONVERT_TWIPS }, { u"" UNO_NAME_CHAR_BOTTOM_BORDER_DISTANCE, RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS }, { u"" UNO_NAME_CHAR_SHADOW_FORMAT, RES_CHRATR_SHADOW, cppu::UnoType<css::table::ShadowFormat>::get(), PROPERTY_NONE, CONVERT_TWIPS}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aAutoCharStyleMap; } -const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetParaStylePropertyMap() +o3tl::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetParaStylePropertyMap() { static SfxItemPropertyMapEntry const aParaStyleMap [] = { @@ -309,13 +302,12 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetParaStylePropertyMa // This entry is for adding that properties to style import/export // Added for paragraph backgrounds, this is for Paragraph Styles FILL_PROPERTIES_SW - { u"", 0, css::uno::Type(), 0, 0 } }; return aParaStyleMap; } -const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetConditionalParaStylePropertyMap() +o3tl::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetConditionalParaStylePropertyMap() { static SfxItemPropertyMapEntry const aParaStyleMap [] = { @@ -328,14 +320,12 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetConditionalParaStyl // This entry is for adding that properties to style import/export // Added for paragraph backgrounds, this is for Paragraph Styles FILL_PROPERTIES_SW - - { u"", 0, css::uno::Type(), 0, 0 } }; return aParaStyleMap; } -const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetFrameStylePropertyMap() +o3tl::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetFrameStylePropertyMap() { static SfxItemPropertyMapEntry const aFrameStyleMap [] = { @@ -424,14 +414,12 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetFrameStylePropertyM // and uno types (see loop at end of this method and definition of SW_PROP_NMID) // This entry is for adding that properties to style import/export FILL_PROPERTIES_SW - - { u"", 0, css::uno::Type(), 0, 0 } }; return aFrameStyleMap; } -const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPageStylePropertyMap() +o3tl::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetPageStylePropertyMap() { static SfxItemPropertyMapEntry const aPageStyleMap [] = { @@ -626,13 +614,12 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPageStylePropertyMa { u"" UNO_NAME_FOOTER_FILLTRANSPARENCEGRADIENTNAME, XATTR_FILLFLOATTRANSPARENCE, cppu::UnoType<OUString>::get(), 0, MID_NAME }, { u"" UNO_NAME_FOOTER_FILLCOLOR_2, XATTR_SECONDARYFILLCOLOR, cppu::UnoType<sal_Int32>::get(), 0, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aPageStyleMap; } -const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetTablePropertyMap() +o3tl::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetTablePropertyMap() { static SfxItemPropertyMapEntry const aTablePropertyMap_Impl[] = { @@ -678,13 +665,12 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetTablePropertyMap() { u"" UNO_NAME_COLLAPSING_BORDERS, RES_COLLAPSING_BORDERS, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, REDLINE_NODE_PROPERTIES { u"" UNO_NAME_TABLE_INTEROP_GRAB_BAG, RES_FRMATR_GRABBAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; return aTablePropertyMap_Impl; } -const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetRangePropertyMap() +o3tl::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetRangePropertyMap() { static SfxItemPropertyMapEntry const aRangePropertyMap_Impl[] = { @@ -700,13 +686,12 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetRangePropertyMap() { u"" UNO_NAME_VERT_ORIENT, RES_VERT_ORIENT, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE ,MID_VERTORIENT_ORIENT }, { u"" UNO_NAME_CHART_ROW_AS_LABEL, FN_UNO_RANGE_ROW_LABEL, cppu::UnoType<bool>::get(), PropertyAttribute::MAYBEVOID, 0}, { u"" UNO_NAME_CHART_COLUMN_AS_LABEL, FN_UNO_RANGE_COL_LABEL, cppu::UnoType<bool>::get() , PropertyAttribute::MAYBEVOID, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aRangePropertyMap_Impl; } -const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetSectionPropertyMap() +o3tl::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetSectionPropertyMap() { static SfxItemPropertyMapEntry const aSectionPropertyMap_Impl[] = { @@ -753,13 +738,12 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetSectionPropertyMap( { u"" UNO_NAME_WRITING_MODE, RES_FRAMEDIR, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 }, { u"" UNO_NAME_SECT_LEFT_MARGIN, RES_LR_SPACE, cppu::UnoType<sal_Int32>::get(), PropertyAttribute::MAYBEVOID, MID_L_MARGIN|CONVERT_TWIPS}, { u"" UNO_NAME_SECT_RIGHT_MARGIN, RES_LR_SPACE, cppu::UnoType<sal_Int32>::get(), PropertyAttribute::MAYBEVOID, MID_R_MARGIN|CONVERT_TWIPS}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aSectionPropertyMap_Impl; } -const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetFramePropertyMap() +o3tl::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetFramePropertyMap() { static SfxItemPropertyMapEntry const aFramePropertyMap_Impl[] = { // @@ -788,14 +772,12 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetFramePropertyMap() // and uno types (see loop at end of this method and definition of SW_PROP_NMID) // This entry is for adding that properties to FlyFrame import/export FILL_PROPERTIES_SW - - { u"", 0, css::uno::Type(), 0, 0 } }; return aFramePropertyMap_Impl; } -const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetGraphicPropertyMap() +o3tl::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetGraphicPropertyMap() { static SfxItemPropertyMapEntry const aGraphicPropertyMap_Impl[] = { @@ -835,14 +817,12 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetGraphicPropertyMap( // and uno types (see loop at end of this method and definition of SW_PROP_NMID) // This entry is for adding that properties to Writer GraphicObject import/export FILL_PROPERTIES_SW - - { u"", 0, css::uno::Type(), 0, 0 } }; return aGraphicPropertyMap_Impl; } -const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetEmbeddedPropertyMap() +o3tl::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetEmbeddedPropertyMap() { static SfxItemPropertyMapEntry const aEmbeddedPropertyMap_Impl[] = { // @@ -870,14 +850,12 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetEmbeddedPropertyMap // and uno types (see loop at end of this method and definition of SW_PROP_NMID) // This entry is for adding that properties to OLE/EmbeddedObject import/export FILL_PROPERTIES_SW - - { u"", 0, css::uno::Type(), 0, 0 } }; return aEmbeddedPropertyMap_Impl; } -const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetIndexMarkPropertyMap() +o3tl::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetIndexMarkPropertyMap() { static SfxItemPropertyMapEntry const aIdxMarkMap_Impl[] = { @@ -889,26 +867,24 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetIndexMarkPropertyMa { u"" UNO_NAME_SECONDARY_KEY_READING, WID_SECONDARY_KEY_READING, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, { u"" UNO_NAME_IS_MAIN_ENTRY, WID_MAIN_ENTRY, cppu::UnoType<bool>::get() , PROPERTY_NONE, 0}, COMMON_TEXT_CONTENT_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; return aIdxMarkMap_Impl; } -const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetContentMarkPropertyMap() +o3tl::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetContentMarkPropertyMap() { static SfxItemPropertyMapEntry const aContentMarkMap_Impl[] = { { u"" UNO_NAME_ALTERNATIVE_TEXT, WID_ALT_TEXT, cppu::UnoType<OUString>::get() , PROPERTY_NONE, 0}, { u"" UNO_NAME_LEVEL, WID_LEVEL , cppu::UnoType<sal_Int16>::get() , PROPERTY_NONE, 0}, COMMON_TEXT_CONTENT_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; return aContentMarkMap_Impl; } -const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetUserMarkPropertyMap() +o3tl::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetUserMarkPropertyMap() { static SfxItemPropertyMapEntry const aUserMarkMap_Impl[] = { @@ -916,13 +892,12 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetUserMarkPropertyMap { u"" UNO_NAME_LEVEL, WID_LEVEL , cppu::UnoType<sal_Int16>::get() , PROPERTY_NONE, 0}, { u"" UNO_NAME_USER_INDEX_NAME, WID_USER_IDX_NAME, cppu::UnoType<OUString>::get() , PROPERTY_NONE, 0}, COMMON_TEXT_CONTENT_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; return aUserMarkMap_Impl; } -const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetTextTableCursorPropertyMap() +o3tl::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetTextTableCursorPropertyMap() { // The PropertySet corresponds to the Range without Chart properties static SfxItemPropertyMapEntry const aTableCursorPropertyMap_Impl [] = @@ -942,13 +917,12 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetTextTableCursorProp { u"" UNO_NAME_TEXT_SECTION, FN_UNO_TEXT_SECTION, cppu::UnoType<css::text::XTextSection>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 }, { u"" UNO_NAME_IS_PROTECTED, RES_PROTECT, cppu::UnoType<bool>::get(), 0, MID_PROTECT_CONTENT}, { u"" UNO_NAME_VERT_ORIENT, RES_VERT_ORIENT, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE ,MID_VERTORIENT_ORIENT }, - { u"", 0, css::uno::Type(), 0, 0 } }; return aTableCursorPropertyMap_Impl; } -const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetBookmarkPropertyMap() +o3tl::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetBookmarkPropertyMap() { static SfxItemPropertyMapEntry const aBookmarkPropertyMap_Impl [] = { @@ -956,24 +930,22 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetBookmarkPropertyMap COMMON_TEXT_CONTENT_PROPERTIES { u"" UNO_NAME_BOOKMARK_HIDDEN, FN_BOOKMARK_HIDDEN, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 }, { u"" UNO_NAME_BOOKMARK_CONDITION, FN_BOOKMARK_CONDITION, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; return aBookmarkPropertyMap_Impl; } -const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetParagraphExtensionsPropertyMap() +o3tl::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetParagraphExtensionsPropertyMap() { static SfxItemPropertyMapEntry const aParagraphExtensionsMap_Impl[] = { COMMON_TEXT_CONTENT_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; return aParagraphExtensionsMap_Impl; } -const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetTextPortionExtensionPropertyMap() +o3tl::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetTextPortionExtensionPropertyMap() { static SfxItemPropertyMapEntry const aTextPortionExtensionMap_Impl[] = { @@ -987,38 +959,35 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetTextPortionExtensio {u"" UNO_NAME_META, FN_UNO_META, cppu::UnoType<css::text::XTextContent>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 }, { u"" UNO_NAME_LINEBREAK, FN_UNO_LINEBREAK, cppu::UnoType<css::text::XTextContent>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 }, { u"" UNO_NAME_CONTENT_CONTROL, FN_UNO_CONTENT_CONTROL, cppu::UnoType<css::text::XTextContent>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; return aTextPortionExtensionMap_Impl; } -const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetFootnotePropertyMap() +o3tl::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetFootnotePropertyMap() { static SfxItemPropertyMapEntry const aFootnoteMap_Impl[] = { {u"" UNO_NAME_REFERENCE_ID, 0, cppu::UnoType<sal_Int16>::get(),PropertyAttribute::READONLY|PropertyAttribute::MAYBEVOID, 0}, COMMON_TEXT_CONTENT_PROPERTIES REDLINE_NODE_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; return aFootnoteMap_Impl; } -const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetLineBreakPropertyMap() +o3tl::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetLineBreakPropertyMap() { static SfxItemPropertyMapEntry const aLineBreakMap_Impl[] = { { u"" UNO_NAME_CLEAR, 0, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 }, COMMON_TEXT_CONTENT_PROPERTIES - { u"", 0, css::uno::Type(), 0, 0 } }; return aLineBreakMap_Impl; } -const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetContentControlPropertyMap() +o3tl::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetContentControlPropertyMap() { static SfxItemPropertyMapEntry const aContentControlMap_Impl[] = { @@ -1039,13 +1008,12 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetContentControlProper { u"" UNO_NAME_DATA_BINDING_XPATH, 0, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0 }, { u"" UNO_NAME_DATA_BINDING_STORE_ITEM_ID, 0, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0 }, { u"" UNO_NAME_COLOR, 0, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0 }, - { u"", 0, css::uno::Type(), 0, 0 } }; return aContentControlMap_Impl; } -const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetRedlinePropertyMap() +o3tl::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetRedlinePropertyMap() { static SfxItemPropertyMapEntry const aRedlineMap_Impl[] = { @@ -1053,13 +1021,12 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetRedlinePropertyMap( REDLINE_NODE_PROPERTIES {u"" UNO_NAME_REDLINE_START, 0, cppu::UnoType<css::uno::XInterface>::get(), PropertyAttribute::READONLY, 0}, {u"" UNO_NAME_REDLINE_END, 0, cppu::UnoType<css::uno::XInterface>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aRedlineMap_Impl; } -SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetTextDefaultPropertyMap() +o3tl::span<SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetTextDefaultPropertyMap() { static SfxItemPropertyMapEntry aTextDefaultMap_Impl[] = { @@ -1074,13 +1041,12 @@ SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetTextDefaultPropertyMap() //text grid enhancement for better CJK support. 2007-04-01 //just export the default page mode property, other properties are not handled in this version { u"" UNO_NAME_GRID_STANDARD_PAGE_MODE, RES_TEXTGRID, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_GRID_STANDARD_MODE}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aTextDefaultMap_Impl; } -const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetRedlinePortionPropertyMap() +o3tl::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetRedlinePortionPropertyMap() { static SfxItemPropertyMapEntry const aRedlinePortionMap_Impl[] = { @@ -1091,7 +1057,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetRedlinePortionPrope {u"" UNO_NAME_IS_START, FN_UNO_IS_START, cppu::UnoType<bool>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 }, REDLINE_PROPERTIES(0) {u"" UNO_NAME_TEXT_PORTION_TYPE, FN_UNO_TEXT_PORTION_TYPE, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; return aRedlinePortionMap_Impl; @@ -1101,7 +1066,7 @@ const SfxItemPropertySet* SwUnoPropertyMapProvider::GetPropertySet( sal_uInt16 { if( !m_aPropertySetArr[nPropertyId] ) { - const SfxItemPropertyMapEntry* pEntries = GetPropertyMapEntries(nPropertyId); + o3tl::span<const SfxItemPropertyMapEntry> pEntries = GetPropertyMapEntries(nPropertyId); switch( nPropertyId ) { case PROPERTY_MAP_TEXT_CURSOR: diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 3d4cf5dfe16a..394534b6c8f6 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -2079,7 +2079,6 @@ SwXTextCursor::getPropertySetInfo() { { u"" UNO_NAME_IS_SKIP_HIDDEN_TEXT, FN_SKIP_HIDDEN_TEXT, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, { u"" UNO_NAME_IS_SKIP_PROTECTED_TEXT, FN_SKIP_PROTECTED_TEXT, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; const uno::Reference< beans::XPropertySetInfo > xInfo = m_rPropSet.getPropertySetInfo(); diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index dcc6f1fb7abd..064f23b30a48 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -126,7 +126,6 @@ static const SfxItemPropertySet* GetFootnoteSet() { u"" UNO_NAME_PREFIX, WID_PREFIX, ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, { u"" UNO_NAME_START_AT, WID_START_AT , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0}, { u"" UNO_NAME_SUFFIX, WID_SUFFIX, ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; static const SfxItemPropertySet aFootnoteSet_Impl(aFootnoteMap_Impl); return &aFootnoteSet_Impl; @@ -144,7 +143,6 @@ static const SfxItemPropertySet* GetEndnoteSet() { u"" UNO_NAME_PREFIX, WID_PREFIX, ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, { u"" UNO_NAME_START_AT, WID_START_AT , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0}, { u"" UNO_NAME_SUFFIX, WID_SUFFIX, ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; static const SfxItemPropertySet aEndnoteSet_Impl(aEndnoteMap_Impl); return &aEndnoteSet_Impl; @@ -160,7 +158,6 @@ static const SfxItemPropertySet* GetNumberingRulesSet() { u"" UNO_NAME_NAME, WID_RULE_NAME , ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0}, { u"" UNO_NAME_NUMBERING_IS_OUTLINE, WID_IS_OUTLINE, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, { u"" UNO_NAME_DEFAULT_LIST_ID, WID_DEFAULT_LIST_ID, ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; static const SfxItemPropertySet aNumberingRulesSet_Impl( aNumberingRulesMap_Impl ); return &aNumberingRulesSet_Impl; @@ -181,7 +178,6 @@ static const SfxItemPropertySet* GetLineNumberingSet() { u"" UNO_NAME_NUMBERING_TYPE, WID_NUMBERING_TYPE , ::cppu::UnoType<sal_Int16>::get(),PROPERTY_NONE, 0}, { u"" UNO_NAME_RESTART_AT_EACH_PAGE, WID_RESTART_AT_EACH_PAGE, cppu::UnoType<bool>::get() , PROPERTY_NONE, 0}, { u"" UNO_NAME_SEPARATOR_INTERVAL, WID_SEPARATOR_INTERVAL, ::cppu::UnoType<sal_Int16>::get(),PROPERTY_NONE, 0}, - { u"", 0, css::uno::Type(), 0, 0 } }; static const SfxItemPropertySet aLineNumberingSet_Impl(aLineNumberingMap_Impl); return &aLineNumberingSet_Impl; |