diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-05-23 13:30:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-05-24 14:02:09 +0200 |
| commit | 912b8fa62f897fb6fdfd760108d87c4dd468b8ee (patch) | |
| tree | 963e227f85d29c6cbddff0a1920ad767a8cdeb8c /svtools/source | |
| parent | ec062c472ad58eafbb4392241119d5b53760120c (diff) | |
modernize and improve PropertySetInfo
(*) use o3tl::span for the array param, which means we don't need a null
entry to terminate the array
(*) use std::unordered_map to speed things up
(*) mark the array as static at a few more call sites
Change-Id: I05b6cae7552f44459e183ec05cb94e60edb3bfe0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134832
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svtools/source')
| -rw-r--r-- | svtools/source/graphic/renderer.cxx | 1 | ||||
| -rw-r--r-- | svtools/source/uno/unoimap.cxx | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx index 315e3764524c..bbd151c6b40b 100644 --- a/svtools/source/graphic/renderer.cxx +++ b/svtools/source/graphic/renderer.cxx @@ -178,7 +178,6 @@ rtl::Reference<::comphelper::PropertySetInfo> GraphicRendererVCL::createProperty { OUString("Device"), UNOGRAPHIC_DEVICE, cppu::UnoType<uno::Any>::get(), 0, 0 }, { OUString("DestinationRect"), UNOGRAPHIC_DESTINATIONRECT, cppu::UnoType<awt::Rectangle>::get(), 0, 0 }, { OUString("RenderData"), UNOGRAPHIC_RENDERDATA, cppu::UnoType<uno::Any>::get(), 0, 0 }, - { OUString(), 0, css::uno::Type(), 0, 0 } }; return rtl::Reference<::comphelper::PropertySetInfo>( new ::comphelper::PropertySetInfo(aEntries) ); diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx index d7e6f7be8bbf..4d64cc8b405e 100644 --- a/svtools/source/uno/unoimap.cxx +++ b/svtools/source/uno/unoimap.cxx @@ -141,7 +141,6 @@ rtl::Reference<PropertySetInfo> SvUnoImageMapObject::createPropertySetInfo( IMap { OUString("Name"), HANDLE_NAME, cppu::UnoType<OUString>::get(), 0, 0 }, { OUString("IsActive"), HANDLE_ISACTIVE, cppu::UnoType<bool>::get(), 0, 0 }, { OUString("Polygon"), HANDLE_POLYGON, cppu::UnoType<PointSequence>::get(), 0, 0 }, - { OUString(), 0, css::uno::Type(), 0, 0 } }; return rtl::Reference<PropertySetInfo>(new PropertySetInfo( aPolygonObj_Impl )); @@ -158,7 +157,6 @@ rtl::Reference<PropertySetInfo> SvUnoImageMapObject::createPropertySetInfo( IMap { OUString("IsActive"), HANDLE_ISACTIVE, cppu::UnoType<bool>::get(), 0, 0 }, { OUString("Center"), HANDLE_CENTER, cppu::UnoType<awt::Point>::get(), 0, 0 }, { OUString("Radius"), HANDLE_RADIUS, cppu::UnoType<sal_Int32>::get(), 0, 0 }, - { OUString(), 0, css::uno::Type(), 0, 0 } }; return rtl::Reference<PropertySetInfo>(new PropertySetInfo( aCircleObj_Impl )); @@ -175,7 +173,6 @@ rtl::Reference<PropertySetInfo> SvUnoImageMapObject::createPropertySetInfo( IMap { OUString("Name"), HANDLE_NAME, cppu::UnoType<OUString>::get(), 0, 0 }, { OUString("IsActive"), HANDLE_ISACTIVE, cppu::UnoType<bool>::get(), 0, 0 }, { OUString("Boundary"), HANDLE_BOUNDARY, cppu::UnoType<awt::Rectangle>::get(), 0, 0 }, - { OUString(), 0, css::uno::Type(), 0, 0 } }; return rtl::Reference<PropertySetInfo>(new PropertySetInfo( aRectangleObj_Impl )); |