diff options
| -rw-r--r-- | comphelper/source/property/propertycontainer2.cxx | 5 | ||||
| -rw-r--r-- | cppuhelper/source/component.cxx | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/comphelper/source/property/propertycontainer2.cxx b/comphelper/source/property/propertycontainer2.cxx index 5a3bfa4be2850..7a57ed57c03bc 100644 --- a/comphelper/source/property/propertycontainer2.cxx +++ b/comphelper/source/property/propertycontainer2.cxx @@ -33,10 +33,7 @@ OPropertyContainer2::~OPropertyContainer2() {} Sequence<Type> OPropertyContainer2::getBaseTypes() { // just the types from our one and only base class - ::cppu::OTypeCollection aTypes(cppu::UnoType<XPropertySet>::get(), - cppu::UnoType<XFastPropertySet>::get(), - cppu::UnoType<XMultiPropertySet>::get()); - return aTypes.getTypes(); + return comphelper::OPropertySetHelper::getTypes(); } bool OPropertyContainer2::convertFastPropertyValue(std::unique_lock<std::mutex>& /*rGuard*/, diff --git a/cppuhelper/source/component.cxx b/cppuhelper/source/component.cxx index 5c7226f93a1a7..3861f35f03bde 100644 --- a/cppuhelper/source/component.cxx +++ b/cppuhelper/source/component.cxx @@ -107,13 +107,13 @@ void OComponentHelper::release() noexcept Sequence< Type > OComponentHelper::getTypes() { - static OTypeCollection s_aTypes( + static const Sequence s_aTypes { cppu::UnoType<lang::XComponent>::get(), cppu::UnoType<lang::XTypeProvider>::get(), cppu::UnoType<XAggregation>::get(), - cppu::UnoType<XWeak>::get() ); + cppu::UnoType<XWeak>::get() }; - return s_aTypes.getTypes(); + return s_aTypes; } // XComponent |