diff options
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/uibase/inc/unoatxt.hxx | 8 | ||||
| -rw-r--r-- | sw/source/uibase/uno/unoatxt.cxx | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/sw/source/uibase/inc/unoatxt.hxx b/sw/source/uibase/inc/unoatxt.hxx index 633a0630a4b2..b28a986ef90a 100644 --- a/sw/source/uibase/inc/unoatxt.hxx +++ b/sw/source/uibase/inc/unoatxt.hxx @@ -30,8 +30,7 @@ #include <com/sun/star/text/XText.hpp> #include <svl/itemprop.hxx> #include <svl/lstner.hxx> -#include <cppuhelper/basemutex.hxx> -#include <cppuhelper/compbase.hxx> +#include <comphelper/compbase.hxx> #include <cppuhelper/implbase.hxx> #include <rtl/ref.hxx> #include <svtools/unoevent.hxx> @@ -152,8 +151,7 @@ public: class SwXAutoTextEntry final :public SfxListener - ,public cppu::BaseMutex - ,public cppu::WeakComponentImplHelper + ,public comphelper::WeakComponentImplHelper < css::text::XAutoTextEntry, css::lang::XServiceInfo, @@ -176,7 +174,7 @@ class SwXAutoTextEntry final } void GetBodyText (); - void SAL_CALL disposing() override; + void disposing(std::unique_lock<std::mutex>&) override; /** ensure that the current content (which may only be in-memory so far) is flushed to the auto text group file diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx index e045d21d6d6a..ea8bd2d880ce 100644 --- a/sw/source/uibase/uno/unoatxt.cxx +++ b/sw/source/uibase/uno/unoatxt.cxx @@ -668,7 +668,6 @@ sal_Int64 SAL_CALL SwXAutoTextEntry::getSomething( const uno::Sequence< sal_Int8 SwXAutoTextEntry::SwXAutoTextEntry(SwGlossaries* pGlss, const OUString& rGroupName, const OUString& rEntryName) : - WeakComponentImplHelper(m_aMutex), pGlossaries(pGlss), sGroupName(rGroupName), sEntryName(rEntryName) @@ -744,7 +743,7 @@ void SwXAutoTextEntry::GetBodyText () mxBodyText = new SwXBodyText ( xDocSh->GetDoc() ); } -void SwXAutoTextEntry::disposing() +void SwXAutoTextEntry::disposing(std::unique_lock<std::mutex>&) { SolarMutexGuard g; implFlushDocument(true); |