cppuhelper/source/typemanager.cxx | 3 ---
cppuhelper/source/typemanager.hxx | 9 +++------
2 files changed, 3 insertions(+), 9 deletions(-)
New commits:
commit 94aba9289af06b3a18f143d1253467f32c4af2cd
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Sun May 7 12:20:57 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue May 9 18:15:20 2023 +0200
use WeakComponentImplHelper2 in TypeManager
Change-Id: I2358006a069ea4e8cdeeeafb8384ad8d47fba50a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151579
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/cppuhelper/source/typemanager.cxx
b/cppuhelper/source/typemanager.cxx
index bede11f7c405..0408234c4b39 100644
--- a/cppuhelper/source/typemanager.cxx
+++ b/cppuhelper/source/typemanager.cxx
@@ -1825,7 +1825,6 @@ void Enumeration::findNextMatch() {
}
cppuhelper::TypeManager::TypeManager():
- TypeManager_Base(m_aMutex),
manager_(new unoidl::Manager)
{}
@@ -1906,8 +1905,6 @@ cppuhelper::TypeManager::resolve(OUString const & name) {
cppuhelper::TypeManager::~TypeManager() noexcept {}
-void cppuhelper::TypeManager::disposing() {} //TODO
-
OUString cppuhelper::TypeManager::getImplementationName()
{
return
diff --git a/cppuhelper/source/typemanager.hxx
b/cppuhelper/source/typemanager.hxx
index 24fe0ef12166..ab1dc4fdbe71 100644
--- a/cppuhelper/source/typemanager.hxx
+++ b/cppuhelper/source/typemanager.hxx
@@ -20,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>
@@ -37,12 +36,12 @@ 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();
@@ -59,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;
