diff options
Diffstat (limited to 'cppuhelper/source/typemanager.hxx')
-rw-r--r-- | cppuhelper/source/typemanager.hxx | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/cppuhelper/source/typemanager.hxx b/cppuhelper/source/typemanager.hxx index dcd415b888b1..ab1dc4fdbe71 100644 --- a/cppuhelper/source/typemanager.hxx +++ b/cppuhelper/source/typemanager.hxx @@ -11,6 +11,8 @@ #include <sal/config.h> +#include <cstddef> + #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/container/XSet.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -18,8 +20,7 @@ #include <com/sun/star/reflection/XTypeDescriptionEnumerationAccess.hpp> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> -#include <cppuhelper/basemutex.hxx> -#include <cppuhelper/compbase.hxx> +#include <compbase2.hxx> #include <rtl/ref.hxx> #include <sal/types.h> @@ -35,19 +36,19 @@ namespace unoidl { namespace cppuhelper { -typedef cppu::WeakComponentImplHelper< +typedef WeakComponentImplHelper2< css::lang::XServiceInfo, css::container::XHierarchicalNameAccess, css::container::XSet, css::reflection::XTypeDescriptionEnumerationAccess > TypeManager_Base; -class TypeManager: private cppu::BaseMutex, public TypeManager_Base { +class TypeManager: public TypeManager_Base { public: TypeManager(); using TypeManager_Base::acquire; using TypeManager_Base::release; - void init(OUString const & rdbUris); + void init(std::u16string_view rdbUris); css::uno::Any find(OUString const & name); @@ -57,8 +58,6 @@ public: private: virtual ~TypeManager() noexcept override; - virtual void SAL_CALL disposing() override; - virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override; @@ -90,9 +89,9 @@ private: css::uno::Sequence< css::uno::TypeClass > const & types, css::reflection::TypeDescriptionSearchDepth depth) override; - void readRdbDirectory(OUString const & uri, bool optional); + void readRdbDirectory(std::u16string_view uri, bool optional); - void readRdbFile(OUString const & uri, bool optional); + void readRdbFile(std::u16string_view uri, bool optional); css::uno::Any getSequenceType(OUString const & name); @@ -100,7 +99,7 @@ private: OUString const & name, sal_Int32 separator); css::uno::Any getInterfaceMember( - OUString const & name, sal_Int32 separator); + std::u16string_view name, std::size_t separator); css::uno::Any getNamed( OUString const & name, @@ -108,12 +107,12 @@ private: static css::uno::Any getEnumMember( rtl::Reference< unoidl::EnumTypeEntity > const & entity, - OUString const & member); + std::u16string_view member); static css::uno::Any getConstant( - OUString const & constantGroupName, + std::u16string_view constantGroupName, rtl::Reference< unoidl::ConstantGroupEntity > const & entity, - OUString const & member); + std::u16string_view member); rtl::Reference< unoidl::Entity > findEntity(OUString const & name); |