diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-02-24 14:06:34 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-02-24 19:40:10 +0000 |
| commit | ce472616b93a3fe1945c6f3ecd058af92782b215 (patch) | |
| tree | 671d45d5e4d8dea3d71f7e63f857c85781c15bed /basic | |
| parent | 3470c58be9c0361f9656ccdf36f7855ea46e5c69 (diff) | |
BaseMutex->std::mutex in SfxLibrary
Change-Id: If059f38bb394844ba72156854eed84de51bbbfac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147654
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/inc/namecont.hxx | 4 | ||||
| -rw-r--r-- | basic/source/uno/namecont.cxx | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx index b5a261c2dde1..6a26b0c9ead2 100644 --- a/basic/source/inc/namecont.hxx +++ b/basic/source/inc/namecont.hxx @@ -44,6 +44,7 @@ #include <osl/mutex.hxx> #include <unotools/eventlisteneradapter.hxx> +#include <comphelper/compbase.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/weakref.hxx> @@ -468,8 +469,7 @@ class SfxLibrary : public css::container::XNameContainer , public css::container::XContainer , public css::util::XChangesNotifier - , public ::cppu::BaseMutex - , public ::cppu::WeakComponentImplHelper<> + , public ::comphelper::WeakComponentImplHelper<> { friend class SfxLibraryContainer; friend class SfxDialogLibraryContainer; diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index 24bcddbded53..7716649ee5fa 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -2930,8 +2930,7 @@ sal_Bool SAL_CALL SfxLibraryContainer::supportsService( const OUString& _rServic // Ctor SfxLibrary::SfxLibrary( ModifiableHelper& _rModifiable, const Type& aType, const Reference< XSimpleFileAccess3 >& xSFI ) - : WeakComponentImplHelper( m_aMutex ) - , mxSFI( xSFI ) + : mxSFI( xSFI ) , mrModifiable( _rModifiable ) , maNameContainer( new NameContainer(aType) ) , mbLoaded( true ) @@ -2952,8 +2951,7 @@ SfxLibrary::SfxLibrary( ModifiableHelper& _rModifiable, const Type& aType, SfxLibrary::SfxLibrary( ModifiableHelper& _rModifiable, const Type& aType, const Reference< XSimpleFileAccess3 >& xSFI, OUString aLibInfoFileURL, OUString aStorageURL, bool ReadOnly ) - : WeakComponentImplHelper( m_aMutex ) - , mxSFI( xSFI ) + : mxSFI( xSFI ) , mrModifiable( _rModifiable ) , maNameContainer( new NameContainer(aType) ) , mbLoaded( false ) |