strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drop some OTypeCollection uses

Browse source 
Change-Id: Ia1467c44998961f5e0820fb4d0621a4189d49d9f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178095
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski 2024-12-08 20:41:14 +05:00
parent f8aa78379c
commit 2ef6b7f9db
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
comphelper/source/property/propertycontainer2.cxx
View file

@ -33,10 +33,7 @@ OPropertyContainer2::~OPropertyContainer2() {}
Sequence<Type> OPropertyContainer2::getBaseTypes() Sequence<Type> OPropertyContainer2::getBaseTypes()
{ {
// just the types from our one and only base class // just the types from our one and only base class
::cppu::OTypeCollection aTypes(cppu::UnoType<XPropertySet>::get(), return comphelper::OPropertySetHelper::getTypes();
cppu::UnoType<XFastPropertySet>::get(),
cppu::UnoType<XMultiPropertySet>::get());
return aTypes.getTypes();
} }
bool OPropertyContainer2::convertFastPropertyValue(std::unique_lock<std::mutex>& /*rGuard*/, bool OPropertyContainer2::convertFastPropertyValue(std::unique_lock<std::mutex>& /*rGuard*/,

6
cppuhelper/source/component.cxx
View file

@ -107,13 +107,13 @@ void OComponentHelper::release() noexcept
Sequence< Type > OComponentHelper::getTypes() Sequence< Type > OComponentHelper::getTypes()
{ {
static OTypeCollection s_aTypes( static const Sequence s_aTypes {
cppu::UnoType<lang::XComponent>::get(), cppu::UnoType<lang::XComponent>::get(),
cppu::UnoType<lang::XTypeProvider>::get(), cppu::UnoType<lang::XTypeProvider>::get(),
cppu::UnoType<XAggregation>::get(), cppu::UnoType<XAggregation>::get(),
cppu::UnoType<XWeak>::get() ); cppu::UnoType<XWeak>::get() };
return s_aTypes.getTypes(); return s_aTypes;
} }
// XComponent // XComponent