diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-12-25 21:04:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-12-27 07:59:32 +0100 |
| commit | e056276600dc9a9e0ac649c995c3af7a42cbee4e (patch) | |
| tree | 13e794ea4734022be2fcd10536ce21ac2492dd6f /sc | |
| parent | ae80ee2d722ea8a0a0e133488f829b331ca2c195 (diff) | |
use comphelper::WeakComponentImplHelper in ScEditFieldObj
Change-Id: I7e839be0685958b12760ef499bc6c71b5003fcd3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127528
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/fielduno.hxx | 7 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/fielduno.cxx | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx index 88f42f991869..f4cf3bac7520 100644 --- a/sc/inc/fielduno.hxx +++ b/sc/inc/fielduno.hxx @@ -32,12 +32,11 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/util/XRefreshable.hpp> #include <com/sun/star/util/DateTime.hpp> -#include <cppuhelper/basemutex.hxx> #include <comphelper/interfacecontainer3.hxx> #include <comphelper/servicehelper.hxx> #include <cppuhelper/component.hxx> #include <cppuhelper/implbase.hxx> -#include <cppuhelper/compbase.hxx> +#include <comphelper/compbase.hxx> #include <osl/mutex.hxx> #include <memory> @@ -159,12 +158,12 @@ public: * Generic UNO wrapper for edit engine's field item in cells, headers, and * footers. */ -typedef cppu::WeakComponentImplHelper< +typedef comphelper::WeakComponentImplHelper< css::text::XTextField, css::beans::XPropertySet, css::lang::XUnoTunnel, css::lang::XServiceInfo> ScEditFieldObj_Base; -class ScEditFieldObj final : public cppu::BaseMutex, public ScEditFieldObj_Base +class ScEditFieldObj final : public ScEditFieldObj_Base { ScEditFieldObj() = delete; ScEditFieldObj(const ScEditFieldObj&) = delete; diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index 76a63a72a08c..d3b64cac7df3 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -1041,7 +1041,6 @@ void ScEditFieldObj::setPropertyValueSheet(const OUString& rName, const uno::Any ScEditFieldObj::ScEditFieldObj( const uno::Reference<text::XTextRange>& rContent, std::unique_ptr<ScEditSource> pEditSrc, sal_Int32 eType, const ESelection& rSel) : - ScEditFieldObj_Base(m_aMutex), pPropSet(nullptr), mpEditSource(std::move(pEditSrc)), aSelection(rSel), |