diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-12-21 16:54:15 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-01-01 19:25:29 +0100 |
| commit | 98dbb1b50af57b3070da6434825e79747f536f8a (patch) | |
| tree | 4ecf5f25f3bee0ed43e98034876a446bd79eec29 /svx | |
| parent | 335ecfee17f9971b431761e978ae3c89e742891c (diff) | |
use cppu::BaseMutex in FmXFormShell
because passing a ref of a local member to a parent class
means passing uninitialised data
Change-Id: Idaa8d3d3c54a14e184c84a0d6df15219b2ec2f8c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127832
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/inc/fmshimp.hxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index 4c511897babc..a468bc030b7d 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -43,6 +43,7 @@ #include <svx/fmtools.hxx> #include <osl/mutex.hxx> #include <comphelper/container.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <unotools/configitem.hxx> #include "formcontrolling.hxx" @@ -150,7 +151,8 @@ struct SdrViewEvent; class FmFormShell; class FmFormView; class FmFormObj; -class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) FmXFormShell final : public FmXFormShell_BASE +class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) FmXFormShell final : private cppu::BaseMutex + ,public FmXFormShell_BASE ,public FmXFormShell_CFGBASE ,public svx::IControllerFeatureInvalidation { @@ -182,7 +184,6 @@ class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) FmXFormShell final : public FmXFormShe // (the array is thus only valid during the search process) std::vector<sal_Int16> m_arrRelativeGridColumn; - ::osl::Mutex m_aMutex; ImplSVEvent * m_nInvalidationEvent; ImplSVEvent * m_nActivationEvent; ::std::queue< FmLoadAction > |